From 48ded0a9ba79b8b90c8e33a52d9c2b85a17a7e4a Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Wed, 19 Feb 2025 14:22:56 +0800
Subject: [PATCH 01/20] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20#[1349157963399168?=
 =?UTF-8?q?]CMDB=E5=BA=94=E7=94=A8=E6=B8=85=E5=8D=95=E6=94=B9=E6=88=90?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=B1=82=E7=BA=A7=E5=8F=AF=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=20http://192.168.0.96:8090/demo/rdm.html#/story-detail/9390509?=
 =?UTF-8?q?47543040/939050947543042/1349157963399168?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/plugins/TsForm/TsFormTree.vue   |   2 +-
 .../cmdb/resourceentity/ci/ci-setting.vue     | 137 +++++++++++++
 .../pages/cmdb/resourceentity/ci/ci-tree.vue  | 190 ++++++++++++++++++
 .../cmdb/resourceentity/mapping-setting.vue   |  40 ++++
 .../resourceentity/resourceentity-edit.vue    |  37 +++-
 .../resourceentity/typecomponent/index.js     |   4 +-
 .../typecomponent/newrel-type.vue             | 110 ++++++++++
 7 files changed, 509 insertions(+), 11 deletions(-)
 create mode 100644 src/views/pages/cmdb/resourceentity/ci/ci-setting.vue
 create mode 100644 src/views/pages/cmdb/resourceentity/ci/ci-tree.vue
 create mode 100644 src/views/pages/cmdb/resourceentity/typecomponent/newrel-type.vue

diff --git a/src/resources/plugins/TsForm/TsFormTree.vue b/src/resources/plugins/TsForm/TsFormTree.vue
index 0b5947666..83ced231f 100755
--- a/src/resources/plugins/TsForm/TsFormTree.vue
+++ b/src/resources/plugins/TsForm/TsFormTree.vue
@@ -441,7 +441,7 @@ export default {
       let label = this.multiple ? this.selectedList.map(s => s[this.textName]) 
         : this.selectedList.length > 0 ? this.selectedList[0][this.textName] : '';
       let valueObject = this.selectedList.map((item) => { 
-        return { 'value': item[this.valueName], 'text': item[this.textName] }; 
+        return { ...item || {}, 'value': item[this.valueName], 'text': item[this.textName] }; 
       });
       valueObject = this.multiple ? valueObject : (valueObject[0] || {});
       this.$emit('change', this.currentValue, valueObject);
diff --git a/src/views/pages/cmdb/resourceentity/ci/ci-setting.vue b/src/views/pages/cmdb/resourceentity/ci/ci-setting.vue
new file mode 100644
index 000000000..5e0b49185
--- /dev/null
+++ b/src/views/pages/cmdb/resourceentity/ci/ci-setting.vue
@@ -0,0 +1,137 @@
+<template>
+  <div class="team-treeview findUuid">
+    <div
+      v-for="(cd, index) in childrenList"
+      :key="cd.uuid"
+      :uuid="cd.uuid"
+      :parentUuid="cd.parentUuid"
+      :index="index"
+      class="findUuid"
+    >
+      <span class="sub-line"></span>
+      <div class="flex-between ci-list bg-op">
+        <div style="width: 100%;flex: 1;">
+          <TsFormTree
+            ref="mainCi"
+            v-model="cd.ciName"
+            v-bind="treeConfig"
+            @on-change="(val, selectItem) => {
+              changeCiName(selectItem, cd);
+            }"
+          ></TsFormTree>
+        </div>
+        <div class="btn-list">
+          <ul class="action-group">
+            <li class="action-item tsfont-plus" @click="addItem(cd)">下级</li>
+          </ul>
+        </div>
+      </div>
+      <CiTree
+        v-if="cd.children"
+        ref="subCiTree"
+        :children="cd.children"
+        class="item-sub"
+      ></CiTree>
+      <template v-if="cd.children && cd.children.length > 0"></template>
+    </div>
+  </div>
+</template>
+<script>
+import CiTree from './ci-tree.vue';
+export default {
+  name: '',
+  components: {
+    CiTree,
+    TsFormTree: () => import('@/resources/plugins/TsForm/TsFormTree')
+  },
+  props: {
+    children: {
+      required: true,
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      treeConfig: {
+        url: 'api/rest/cmdb/ci/listtree',
+        valueName: 'name',
+        textName: 'label',
+        transfer: true,
+        showPath: true,
+        validateList: ['required']
+      },
+      childrenList: this.$utils.deepClone(this.children) || []
+    };
+  },
+  beforeCreate() {},
+  created() {
+  
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    addItem(cd) {
+      if (!cd.children) {
+        this.$set(cd, 'children', []);
+      }
+      cd.children.push({
+        parentUuid: cd.uuid,
+        uuid: this.$utils.setUuid()
+      });
+    },
+    changeCiName(selectItem, cd) {
+      if (selectItem) {
+        this.$set(cd, 'ciLabel', selectItem.text);
+      } else {
+        this.$set(cd, 'ciLabel', '');
+      }
+    },
+    valid() {
+      let isValid = true;
+      if (this.$refs.mainCi && !this.$refs.mainCi[0].valid()) {
+        isValid = false;
+      }
+      if (this.$refs.subCiTree && this.$refs.subCiTree[0].valid()) {
+        isValid = false;
+      }
+      return isValid;
+    }
+  },
+  filter: {},
+  computed: {},
+  watch: {
+    children: {
+      handler(newVal) {
+        if (!this.$utils.isSame(this.childrenList, newVal)) {
+          this.childrenList = this.$utils.deepClone(newVal);
+        }
+      },
+      deep: true
+    },
+    childrenList: {
+      handler(newVal) {
+        this.$emit('updateCiList', newVal);
+      },
+      deep: true
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+.ci-list {
+  padding: 10px 20px;
+  margin-bottom: 8px;
+  border-radius: 10px;
+  .btn-list {
+    width: 120px;
+    padding-left: 10px;
+  }
+}
+</style>
diff --git a/src/views/pages/cmdb/resourceentity/ci/ci-tree.vue b/src/views/pages/cmdb/resourceentity/ci/ci-tree.vue
new file mode 100644
index 000000000..06ca3ef28
--- /dev/null
+++ b/src/views/pages/cmdb/resourceentity/ci/ci-tree.vue
@@ -0,0 +1,190 @@
+<template>
+  <div class="item-sub">
+    <div
+      v-for="(cd, index) in childrenList"
+      :key="cd.uuid"
+      :uuid="cd.uuid"
+      :parentUuid="cd.parentUuid"
+      :index="index"
+    >
+      <span class="sub-line"></span>
+      <div class="flex-between ci-list bg-op">
+        <div style="width: 100%;flex: 1;">
+          <TsRow :gutter="8">
+            <Col span="6">
+              <TsFormSelect
+                ref="formItem"
+                v-model="cd.direction"
+                v-bind="directionConfig"
+                class="mr-sm"
+              ></TsFormSelect>
+            </Col>
+            <Col span="18">
+              <TsFormTree
+                ref="formItem"
+                v-model="cd.ciName"
+                v-bind="treeConfig"
+                @on-change="(val, selectItem) => {
+                  changeCiName(selectItem, cd);
+                }"
+              ></TsFormTree>
+            </Col>
+          </TsRow>
+        </div>
+        <div class="btn-list">
+          <ul class="action-group">
+            <li class="action-item tsfont-plus" @click="addItem(cd)">下级</li>
+            <li class="action-item tsfont-trash-o" @click="deleteItem(index)">{{ $t('page.delete') }}</li>
+          </ul>
+        </div>
+      </div>
+      <CiTree
+        v-if="cd.children"
+        ref="formItem"
+        :children="cd.children"
+        class="item-sub"
+      ></CiTree>
+      <template v-if="cd.children && cd.children.length > 0"></template>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: 'CiTree',
+  components: {
+    CiTree: () => import('./ci-tree.vue'),
+    TsFormTree: () => import('@/resources/plugins/TsForm/TsFormTree'),
+    TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect')
+  },
+  props: {
+    children: {
+      required: true,
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      treeConfig: {
+        url: 'api/rest/cmdb/ci/listtree',
+        valueName: 'name',
+        textName: 'label',
+        transfer: true,
+        showPath: true,
+        validateList: ['required']
+      },
+      directionConfig: {
+        dataList: [
+          {
+            text: 'from',
+            value: 'from'
+          },
+          {
+            text: 'to',
+            value: 'to'
+          }
+        ],
+        validateList: ['required'],
+        transfer: true
+      },
+      childrenList: []
+    };
+  },
+  beforeCreate() {},
+  created() {
+
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    changeCiName(selectItem, cd) {
+      if (selectItem) {
+        this.$set(cd, 'ciLabel', selectItem.text);
+      } else {
+        this.$set(cd, 'ciLabel', '');
+      }
+    },
+    addItem(cd) {
+      if (!cd.children) {
+        this.$set(cd, 'children', []);
+      }
+      cd.children.push({
+        parentUuid: cd.uuid,
+        uuid: this.$utils.setUuid()
+      });
+    },
+    deleteItem(index) {
+      this.childrenList.splice(index, 1);
+    },
+    valid() {
+      let isValid = true;
+      const validList = this.$refs.formItem.map(item => {
+        return item.valid();
+      });
+      isValid = validList.every(item => {
+        if (!item) return false;
+        else return true;
+      });
+      return isValid;
+    }
+  },
+  filter: {},
+  computed: {},
+  watch: {
+    children: {
+      handler(newVal) {
+        this.childrenList = newVal;
+      },
+      deep: true,
+      immediate: true
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+@import (reference) '~@/resources/assets/css/variable.less';
+.item-sub {
+  margin-left: 50px;
+  position: relative;
+  &::before {
+    content: '';
+    display: block;
+    width: 0;
+    position: absolute;
+    top: -7px;
+    bottom: 0;
+    left: -33px;
+    margin-bottom: 26px;
+    border-left: 1px dotted @default-border;
+  }
+  .sub-line {
+    position: absolute;
+    display: inline-block;
+    &::before {
+      content: '';
+      display: block;
+      width: 30px;
+      height: 0;
+      border-top: 1px dotted @default-border;
+      position: absolute;
+      top: 29px;
+      left: -30px;
+    }
+  }
+}
+.ci-list {
+  padding: 10px 20px;
+  margin-bottom: 8px;
+  border-radius: 10px;
+  .btn-list {
+    width: 120px;
+    padding-left: 10px;
+  }
+}
+</style>
diff --git a/src/views/pages/cmdb/resourceentity/mapping-setting.vue b/src/views/pages/cmdb/resourceentity/mapping-setting.vue
index 9577b4f6f..40c91a846 100644
--- a/src/views/pages/cmdb/resourceentity/mapping-setting.vue
+++ b/src/views/pages/cmdb/resourceentity/mapping-setting.vue
@@ -27,6 +27,7 @@
             ref="item"
             :item="item"
             :mainCi="mainCi"
+            :ciList="ciList"
             @change="(val,attr)=>{setConfig(val, attr, item)}"
           ></Items>
         </template>
@@ -48,6 +49,10 @@ export default {
     mainCi: {
       type: String,
       default: ''
+    },
+    ciList: {
+      type: Array,
+      default: () => []
     }
   },
   data() {
@@ -71,6 +76,10 @@ export default {
           text: this.$t('term.cmdb.globalattr'),
           value: 'globalAttr'
         },
+        {
+          text: '新关系',
+          value: 'newRel'
+        },
         {
           text: this.$t('term.expression.empty'),
           value: 'empty'
@@ -145,7 +154,29 @@ export default {
           type: ''
         });
       });
+    },
+    updatedNewRelItem() { //更新新关系字段时更新list
+      if (!this.$utils.isEmpty(this.list)) {
+        this.list = this.list.map(item => {
+          if (item.type === 'newRel') {
+            return {
+              field: item.field,
+              type: ''
+            };
+          } else {
+            return item;
+          }
+        });
+        this.list.forEach(item => {
+          if (item.type === 'newRel') {
+            this.$set(item, 'ci', '');
+            this.$set(item, 'rel', '');
+            this.$set(item, 'attr', '');
+          }
+        });
+      }
     }
+
   },
   filter: {},
   computed: {
@@ -180,6 +211,15 @@ export default {
         }
       },
       immediate: true
+    },
+    ciList: {
+      handler(val) {
+        if (!this.$utils.isSame(val, this.initCiList)) {
+          this.initCiList = this.$utils.deepClone(val);
+          this.updatedNewRelItem();
+        }
+      },
+      deep: true
     }
   }
 };
diff --git a/src/views/pages/cmdb/resourceentity/resourceentity-edit.vue b/src/views/pages/cmdb/resourceentity/resourceentity-edit.vue
index 9732628f1..3e57ca043 100644
--- a/src/views/pages/cmdb/resourceentity/resourceentity-edit.vue
+++ b/src/views/pages/cmdb/resourceentity/resourceentity-edit.vue
@@ -17,16 +17,13 @@
         </template> -->
         <template v-slot:mainCi>
           <template v-if="resourceEntityData.config">
-            <TsFormTree
-              ref="mainCi"
-              v-model="resourceEntityData.config.mainCi"
-              v-bind="treeConfig"
-            ></TsFormTree>
+            <CiSetting ref="ciSetting" :children="ciList" @updateCiList="updateCiList"></CiSetting>
             <MappingSetting
               v-if="!$utils.isEmpty(resourceEntityData)"
               ref="mappingSetting"
               :data="resourceEntityData"
               :mainCi="resourceEntityData.config.mainCi"
+              :ciList="ciList"
               class="pt-nm"
             ></MappingSetting>
           </template>
@@ -45,8 +42,8 @@ export default {
   components: {
     TsForm: () => import('@/resources/plugins/TsForm/TsForm'),
     // TsCodemirror:()=>import('@/resources/plugins/TsCodemirror/TsCodemirror.vue'),
-    TsFormTree: () => import('@/resources/plugins/TsForm/TsFormTree'),
-    MappingSetting: () => import('./mapping-setting.vue')
+    MappingSetting: () => import('./mapping-setting.vue'),
+    CiSetting: () => import('./ci/ci-setting.vue')
   },
   props: {name: {type: String}},
   data() {
@@ -96,7 +93,8 @@ export default {
         transfer: true,
         showPath: true,
         validateList: ['required']
-      }
+      },
+      ciList: []
     };
   },
   beforeCreate() {},
@@ -118,6 +116,22 @@ export default {
           if (!this.resourceEntityData.config) {
             this.$set(this.resourceEntityData, 'config', {});
             this.$set(this.resourceEntityData.config, 'mainCi', '');
+            this.ciList = [];
+          } else {
+            if (!this.$utils.isEmpty(this.resourceEntityData.config.relNode)) {
+              this.ciList = [{
+                ...this.resourceEntityData.config.relNode
+              }];
+            } else if (this.resourceEntityData.config.mainCi) {
+              this.ciList = [{
+                uuid: this.$utils.setUuid(),
+                ciName: this.resourceEntityData.config.mainCi,
+                ciLabel: this.resourceEntityData.config.mainCi,
+                children: []
+              }];
+            } else {
+              this.ciList = [];
+            }
           }
         });
       }
@@ -125,7 +139,7 @@ export default {
     save() {
       // console.log(JSON.stringify(this.resourceEntityData, null, 2));
       let isValid = true;
-      isValid = this.$refs.mainCi.valid() && isValid;
+      isValid = this.$refs.ciSetting.valid() && isValid;
       isValid = this.$refs.mappingSetting.valid() && isValid;
       if (!isValid) {
         return;
@@ -139,6 +153,7 @@ export default {
         }
       });
       this.$set(this.resourceEntityData.config, 'fieldMappingList', fieldMappingList);
+      this.$set(this.resourceEntityData, 'relNode', this.ciList[0]);
       this.$api.cmdb.resourceentity.saveResourceEntity(this.resourceEntityData).then(res => {
         if (res.Status == 'OK') {
           this.$Message.success(this.$t('message.savesuccess'));
@@ -148,6 +163,10 @@ export default {
     },
     close(needRefresh) {
       this.$emit('close', needRefresh);
+    },
+    updateCiList(list) {
+      this.$set(this.resourceEntityData.config, 'mainCi', list[0].ciName);
+      this.ciList = list;
     }
   },
   filter: {},
diff --git a/src/views/pages/cmdb/resourceentity/typecomponent/index.js b/src/views/pages/cmdb/resourceentity/typecomponent/index.js
index 6561dd993..9d0429dcb 100644
--- a/src/views/pages/cmdb/resourceentity/typecomponent/index.js
+++ b/src/views/pages/cmdb/resourceentity/typecomponent/index.js
@@ -2,9 +2,11 @@ import constType from './const-type.vue';
 import attrType from './attr-type.vue';
 import relType from './rel-type.vue';
 import globalAttrType from './globalattr-type.vue';
+import newRelType from './newrel-type.vue';
 export default {
   constType,
   attrType,
   relType,
-  globalAttrType
+  globalAttrType,
+  newRelType
 };
diff --git a/src/views/pages/cmdb/resourceentity/typecomponent/newrel-type.vue b/src/views/pages/cmdb/resourceentity/typecomponent/newrel-type.vue
new file mode 100644
index 000000000..e298930ad
--- /dev/null
+++ b/src/views/pages/cmdb/resourceentity/typecomponent/newrel-type.vue
@@ -0,0 +1,110 @@
+<template>
+  <div class="controller-group">
+    <TsFormTree
+      ref="fromCi"
+      v-model="item.uuid"
+      v-bind="getTreeConfig(list)"
+      :placeholder="$t('page.model')"
+      @on-change="(val, selectItem)=>{
+        changeCi(selectItem, item);
+      }"
+    ></TsFormTree>
+    <template v-if="item.ciName">
+      <TsFormSelect
+        ref="fromAttr"
+        v-model="item.attr"
+        v-bind="getAttrConfig(item.ciName)"
+        :placeholder="$t('page.attribute')"
+      ></TsFormSelect>
+    </template>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect'),
+    TsFormTree: () => import('@/resources/plugins/TsForm/TsFormTree')
+  },
+  props: {
+    item: Object,
+    mainCi: String,
+    ciList: Array
+  },
+  data() {
+    return {
+      list: []
+    };
+  },
+  beforeCreate() {},
+  created() {
+    if (!this.item.fromCi) {
+      this.item.fromCi = this.mainCi;
+    }
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    changeCi(selectObj, item) {
+      this.$set(item, 'ciName', selectObj.ciName || '');
+      this.$set(item, 'ciLabel', selectObj.ciLabel || '');
+    },
+    valid() {
+      let isValid = true;
+      let list = this.$refs;
+      Object.keys(list).forEach(key => {
+        if (this.$refs[key] && !this.$refs[key].valid()) {
+          isValid = false;
+        }
+      });
+      return isValid;
+    }
+  },
+  filter: {},
+  computed: {
+    getTreeConfig() {
+      return (list) => {
+        return {
+          dataList: list || [],
+          valueName: 'uuid',
+          textName: 'ciLabel',
+          transfer: true,
+          showPath: true,
+          validateList: ['required']
+        };
+      };
+    },
+    getAttrConfig() {
+      return (val) => {
+        return {
+          url: '/api/rest/cmdb/ci/listattr/forview',
+          validateList: ['required'],
+          valueName: 'name',
+          textName: 'label',
+          params: {
+            ciName: val
+          },
+          transfer: true
+        };
+      };
+    }
+  },
+  watch: {
+    ciList: {
+      handler(val) {
+        this.list = this.$utils.deepClone(val) || [];
+      },
+      deep: true,
+      immediate: true
+    }
+  }
+};
+</script>
+<style lang="less">
+</style>
-- 
Gitee


From 30ed0156cc2338a6688fff56181deea8e2743e5c Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Wed, 19 Feb 2025 14:45:44 +0800
Subject: [PATCH 02/20] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20#[1349157963399168?=
 =?UTF-8?q?]CMDB=E5=BA=94=E7=94=A8=E6=B8=85=E5=8D=95=E6=94=B9=E6=88=90?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=B1=82=E7=BA=A7=E5=8F=AF=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=20http://192.168.0.96:8090/demo/rdm.html#/story-detail/9390509?=
 =?UTF-8?q?47543040/939050947543042/1349157963399168?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/cmdb/resourceentity/ci/ci-setting.vue   |  2 +-
 .../pages/cmdb/resourceentity/ci/ci-tree.vue      | 15 +++++++--------
 .../cmdb/resourceentity/resourceentity-edit.vue   |  4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/views/pages/cmdb/resourceentity/ci/ci-setting.vue b/src/views/pages/cmdb/resourceentity/ci/ci-setting.vue
index 5e0b49185..7f3c63ca8 100644
--- a/src/views/pages/cmdb/resourceentity/ci/ci-setting.vue
+++ b/src/views/pages/cmdb/resourceentity/ci/ci-setting.vue
@@ -98,7 +98,7 @@ export default {
       if (this.$refs.mainCi && !this.$refs.mainCi[0].valid()) {
         isValid = false;
       }
-      if (this.$refs.subCiTree && this.$refs.subCiTree[0].valid()) {
+      if (this.$refs.subCiTree && !this.$refs.subCiTree[0].valid()) {
         isValid = false;
       }
       return isValid;
diff --git a/src/views/pages/cmdb/resourceentity/ci/ci-tree.vue b/src/views/pages/cmdb/resourceentity/ci/ci-tree.vue
index 06ca3ef28..4e2bdb3a4 100644
--- a/src/views/pages/cmdb/resourceentity/ci/ci-tree.vue
+++ b/src/views/pages/cmdb/resourceentity/ci/ci-tree.vue
@@ -76,11 +76,11 @@ export default {
       directionConfig: {
         dataList: [
           {
-            text: 'from',
+            text: '上游',
             value: 'from'
           },
           {
-            text: 'to',
+            text: '下游',
             value: 'to'
           }
         ],
@@ -124,12 +124,11 @@ export default {
     },
     valid() {
       let isValid = true;
-      const validList = this.$refs.formItem.map(item => {
-        return item.valid();
-      });
-      isValid = validList.every(item => {
-        if (!item) return false;
-        else return true;
+      const list = this.$refs.formItem;
+      list.forEach(item => {
+        if (item.valid && !item.valid()) {
+          isValid = false;
+        }
       });
       return isValid;
     }
diff --git a/src/views/pages/cmdb/resourceentity/resourceentity-edit.vue b/src/views/pages/cmdb/resourceentity/resourceentity-edit.vue
index 3e57ca043..e22e56833 100644
--- a/src/views/pages/cmdb/resourceentity/resourceentity-edit.vue
+++ b/src/views/pages/cmdb/resourceentity/resourceentity-edit.vue
@@ -153,7 +153,7 @@ export default {
         }
       });
       this.$set(this.resourceEntityData.config, 'fieldMappingList', fieldMappingList);
-      this.$set(this.resourceEntityData, 'relNode', this.ciList[0]);
+      this.$set(this.resourceEntityData.config, 'relNode', this.ciList[0]);
       this.$api.cmdb.resourceentity.saveResourceEntity(this.resourceEntityData).then(res => {
         if (res.Status == 'OK') {
           this.$Message.success(this.$t('message.savesuccess'));
@@ -166,7 +166,7 @@ export default {
     },
     updateCiList(list) {
       this.$set(this.resourceEntityData.config, 'mainCi', list[0].ciName);
-      this.ciList = list;
+      this.ciList = this.$utils.deepClone(list);
     }
   },
   filter: {},
-- 
Gitee


From ff43d46f6a5d3066ee313f1e7edf774625182b8d Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Wed, 19 Feb 2025 14:48:51 +0800
Subject: [PATCH 03/20] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20#[1349157963399168?=
 =?UTF-8?q?]CMDB=E5=BA=94=E7=94=A8=E6=B8=85=E5=8D=95=E6=94=B9=E6=88=90?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=B1=82=E7=BA=A7=E5=8F=AF=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=20http://192.168.0.96:8090/demo/rdm.html#/story-detail/9390509?=
 =?UTF-8?q?47543040/939050947543042/1349157963399168?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/cmdb/resourceentity/ci/ci-tree.vue | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/views/pages/cmdb/resourceentity/ci/ci-tree.vue b/src/views/pages/cmdb/resourceentity/ci/ci-tree.vue
index 4e2bdb3a4..3002585ff 100644
--- a/src/views/pages/cmdb/resourceentity/ci/ci-tree.vue
+++ b/src/views/pages/cmdb/resourceentity/ci/ci-tree.vue
@@ -125,11 +125,13 @@ export default {
     valid() {
       let isValid = true;
       const list = this.$refs.formItem;
-      list.forEach(item => {
-        if (item.valid && !item.valid()) {
-          isValid = false;
-        }
-      });
+      if (list && list.length > 0) {
+        list.forEach(item => {
+          if (item.valid && !item.valid()) {
+            isValid = false;
+          }
+        });
+      }
       return isValid;
     }
   },
-- 
Gitee


From e482d829759eb53e1c9338e271fb0a5dcca23778 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Wed, 19 Feb 2025 15:07:56 +0800
Subject: [PATCH 04/20] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20#[1349157963399168?=
 =?UTF-8?q?]CMDB=E5=BA=94=E7=94=A8=E6=B8=85=E5=8D=95=E6=94=B9=E6=88=90?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=B1=82=E7=BA=A7=E5=8F=AF=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=20http://192.168.0.96:8090/demo/rdm.html#/story-detail/9390509?=
 =?UTF-8?q?47543040/939050947543042/1349157963399168?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../typecomponent/newrel-type.vue             | 48 ++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/src/views/pages/cmdb/resourceentity/typecomponent/newrel-type.vue b/src/views/pages/cmdb/resourceentity/typecomponent/newrel-type.vue
index e298930ad..44a882701 100644
--- a/src/views/pages/cmdb/resourceentity/typecomponent/newrel-type.vue
+++ b/src/views/pages/cmdb/resourceentity/typecomponent/newrel-type.vue
@@ -15,6 +15,7 @@
         v-model="item.attr"
         v-bind="getAttrConfig(item.ciName)"
         :placeholder="$t('page.attribute')"
+        :dealDataByUrl="dealDataByUrl"
       ></TsFormSelect>
     </template>
   </div>
@@ -33,7 +34,41 @@ export default {
   },
   data() {
     return {
-      list: []
+      list: [],
+      dataList: [
+        {
+          name: '_id',
+          label: 'ID'
+        },
+        {
+          name: '_uuid',
+          label: 'UUID'
+        },
+        {
+          name: '_name',
+          label: this.$t('page.name')
+        },
+        {
+          name: '_fcu',
+          label: this.$t('page.creator')
+        },
+        {
+          name: '_fcd',
+          label: this.$t('page.createdate')
+        },
+        {
+          name: '_lcu',
+          label: this.$t('page.fcu')
+        },
+        {
+          name: '_lcd',
+          label: this.$t('page.lcu')
+        },
+        {
+          name: '_typeId',
+          label: this.$t('page.type') + 'ID'
+        }
+      ]
     };
   },
   beforeCreate() {},
@@ -64,6 +99,17 @@ export default {
         }
       });
       return isValid;
+    },
+    dealDataByUrl(nodeList) {
+      let columlist = this.$utils.deepClone(this.dataList); //需要补上一些固有属性选项
+      if (nodeList && nodeList.length > 0) {
+        nodeList.forEach(item => {
+          if (item.type != 'select') {
+            columlist.push(item);
+          }
+        });
+      }
+      return columlist;
     }
   },
   filter: {},
-- 
Gitee


From d29f26c0c9c3754c117d1c0c3b649a9599421639 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Wed, 19 Feb 2025 16:28:51 +0800
Subject: [PATCH 05/20] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20#[1349157963399168?=
 =?UTF-8?q?]CMDB=E5=BA=94=E7=94=A8=E6=B8=85=E5=8D=95=E6=94=B9=E6=88=90?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=B1=82=E7=BA=A7=E5=8F=AF=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=20http://192.168.0.96:8090/demo/rdm.html#/story-detail/9390509?=
 =?UTF-8?q?47543040/939050947543042/1349157963399168?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/cmdb/resourceentity/ci/ci-setting.vue | 15 ++++++++++-----
 .../pages/cmdb/resourceentity/ci/ci-tree.vue    | 17 ++++++++++++-----
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/views/pages/cmdb/resourceentity/ci/ci-setting.vue b/src/views/pages/cmdb/resourceentity/ci/ci-setting.vue
index 7f3c63ca8..a4d70e38b 100644
--- a/src/views/pages/cmdb/resourceentity/ci/ci-setting.vue
+++ b/src/views/pages/cmdb/resourceentity/ci/ci-setting.vue
@@ -1,16 +1,14 @@
 <template>
-  <div class="team-treeview findUuid">
+  <div>
     <div
       v-for="(cd, index) in childrenList"
       :key="cd.uuid"
       :uuid="cd.uuid"
       :parentUuid="cd.parentUuid"
       :index="index"
-      class="findUuid"
     >
-      <span class="sub-line"></span>
-      <div class="flex-between ci-list bg-op">
-        <div style="width: 100%;flex: 1;">
+      <div class="ci-list bg-op">
+        <div class="ci-item">
           <TsFormTree
             ref="mainCi"
             v-model="cd.ciName"
@@ -126,9 +124,16 @@ export default {
 </script>
 <style lang="less" scoped>
 .ci-list {
+  display: flex;
+  align-items: start;
+  justify-content: flex-start;
   padding: 10px 20px;
   margin-bottom: 8px;
   border-radius: 10px;
+  .ci-item {
+    width: 100%;
+    flex: 1;
+  }
   .btn-list {
     width: 120px;
     padding-left: 10px;
diff --git a/src/views/pages/cmdb/resourceentity/ci/ci-tree.vue b/src/views/pages/cmdb/resourceentity/ci/ci-tree.vue
index 3002585ff..70ee5408e 100644
--- a/src/views/pages/cmdb/resourceentity/ci/ci-tree.vue
+++ b/src/views/pages/cmdb/resourceentity/ci/ci-tree.vue
@@ -8,8 +8,8 @@
       :index="index"
     >
       <span class="sub-line"></span>
-      <div class="flex-between ci-list bg-op">
-        <div style="width: 100%;flex: 1;">
+      <div class="ci-list bg-op">
+        <div class="ci-item">
           <TsRow :gutter="8">
             <Col span="6">
               <TsFormSelect
@@ -66,7 +66,7 @@ export default {
   data() {
     return {
       treeConfig: {
-        url: 'api/rest/cmdb/ci/listtree',
+        url: '/api/rest/cmdb/ci/listtree',
         valueName: 'name',
         textName: 'label',
         transfer: true,
@@ -76,11 +76,11 @@ export default {
       directionConfig: {
         dataList: [
           {
-            text: '上游',
+            text: this.$t('term.cmdb.fromci'),
             value: 'from'
           },
           {
-            text: '下游',
+            text: this.$t('term.cmdb.toci'),
             value: 'to'
           }
         ],
@@ -180,9 +180,16 @@ export default {
   }
 }
 .ci-list {
+  display: flex;
+  align-items: start;
+  justify-content: flex-start;
   padding: 10px 20px;
   margin-bottom: 8px;
   border-radius: 10px;
+  .ci-item {
+    width: 100%;
+    flex: 1;
+  }
   .btn-list {
     width: 120px;
     padding-left: 10px;
-- 
Gitee


From aeb38dc3a0c64eed45ca51b0ce75338f69d57c78 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Fri, 21 Feb 2025 15:33:41 +0800
Subject: [PATCH 06/20] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B9=E7=AE=A1=E7=90=86-=E5=BA=94=E7=94=A8=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=20=20-[=E5=85=B3=E8=81=94]=20#[1349157963399168]CMDB?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E6=B8=85=E5=8D=95=E6=94=B9=E6=88=90=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E5=B1=82=E7=BA=A7=E5=8F=AF=E9=85=8D=E7=BD=AE=20http:/?=
 =?UTF-8?q?/192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/?=
 =?UTF-8?q?939050947543042/1349157963399168?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../applicationManage/applicationManage.js    |   9 +
 src/resources/assets/css/theme.less           |   2 +
 .../cmdb/newapplication/app-edit-dialog.vue   |  82 +++
 .../cmdb/newapplication/app-module-tree.vue   | 553 ++++++++++++++++++
 .../newapplication/application-manage.vue     | 253 ++++++++
 .../newapplication/appmodule-edit-dialog.vue  |  87 +++
 .../cmdb/newapplication/assets-manage.vue     | 281 +++++++++
 .../pages/cmdb/newapplication/automation.vue  | 152 +++++
 .../ci-attr-setting-dialog.vue.vue            | 151 +++++
 .../newapplication/inspect-status-detail.vue  |  34 ++
 src/views/pages/cmdb/router.js                |  13 +
 11 files changed, 1617 insertions(+)
 create mode 100644 src/views/pages/cmdb/newapplication/app-edit-dialog.vue
 create mode 100644 src/views/pages/cmdb/newapplication/app-module-tree.vue
 create mode 100644 src/views/pages/cmdb/newapplication/application-manage.vue
 create mode 100644 src/views/pages/cmdb/newapplication/appmodule-edit-dialog.vue
 create mode 100644 src/views/pages/cmdb/newapplication/assets-manage.vue
 create mode 100644 src/views/pages/cmdb/newapplication/automation.vue
 create mode 100644 src/views/pages/cmdb/newapplication/ci-attr-setting-dialog.vue.vue
 create mode 100644 src/views/pages/cmdb/newapplication/inspect-status-detail.vue

diff --git a/src/resources/api/cmdb/resource/applicationManage/applicationManage.js b/src/resources/api/cmdb/resource/applicationManage/applicationManage.js
index ec520e3f0..a51c18375 100644
--- a/src/resources/api/cmdb/resource/applicationManage/applicationManage.js
+++ b/src/resources/api/cmdb/resource/applicationManage/applicationManage.js
@@ -39,6 +39,15 @@ const applicationManage = {
   getAppmoduleById(params) {
     // 根据模块id，获取模块信息
     return axios.post('api/rest/resourcecenter/appmodule/get', params);
+  },
+  getApplicationlistSetting() { //获取应用清单显示设置
+    return axios.post('/api/rest/resourcecenter/applicationlist/display/get', {});
+  },
+  saveApplicationlistSetting(params) { //保存应用清单显示设置
+    return axios.post('/api/rest/resourcecenter/applicationlist/display/save', params);
+  },
+  getAppResourceList(params) { 
+    return axios.post('/api/rest/resourcecenter/app/resource/list', params);
   }
 };
 export default applicationManage;
diff --git a/src/resources/assets/css/theme.less b/src/resources/assets/css/theme.less
index 8e600bb3a..1e11750b4 100644
--- a/src/resources/assets/css/theme.less
+++ b/src/resources/assets/css/theme.less
@@ -3393,6 +3393,8 @@
 
   //Tabs
   .@{iv-prev}tabs {
+    border-spacing: 0px; //表格组件边框间距问题
+
     .@{iv-prev}tabs-bar {
       border-color: var(--dividing-color, @dividing-color);
     }
diff --git a/src/views/pages/cmdb/newapplication/app-edit-dialog.vue b/src/views/pages/cmdb/newapplication/app-edit-dialog.vue
new file mode 100644
index 000000000..3f473a6b9
--- /dev/null
+++ b/src/views/pages/cmdb/newapplication/app-edit-dialog.vue
@@ -0,0 +1,82 @@
+<template>
+  <TsDialog v-bind="setting" :isShow="true" @on-close="close">
+    <div>
+      <Loading
+        v-if="isLoading"
+        :text="$t('page.datasaving')"
+        :loadingShow="isLoading"
+        type="fix"
+      ></Loading>
+      <EditCiEntity
+        ref="editContainer"
+        mode="dialog"
+        :propCiId="ciId"
+        :propCiEntityId="ciEntityId"
+        :isRequired="1"
+        saveMode="emit"
+        :hideHeader="true"
+        @save="save"
+        @cancel="close"
+      ></EditCiEntity>
+    </div>
+  </TsDialog>
+</template>
+<script>
+import EditCiEntity from '@/views/pages/cmdb/cientity/cientity-edit.vue';
+export default {
+  name: '',
+  components: {
+    EditCiEntity
+  },
+  filters: {},
+  props: {
+    ciId: {
+      type: Number
+    },
+    ciEntityId: {
+      type: Number
+    }
+  },
+  data() {
+    return {
+      isLoading: false,
+      setting: {
+        title: this.ciEntityId ? this.$t('dialog.title.edittarget', {'target': this.$t('page.apply')}) : this.$t('dialog.title.addtarget', {'target': this.$t('page.apply')}),
+        maskClose: false,
+        width: 'large',
+        hasFooter: false
+      }
+    };
+  },
+  beforeCreate() {},
+  created() {
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    close() {
+      this.$emit('close');
+    },
+    save(ciEntityList) {
+      this.isLoading = true;
+      this.$api.cmdb.cientity.batchSaveCiEntity({ciEntityList: ciEntityList, needCommit: true}).then(res => {
+        if (res.Status == 'OK') {
+          this.$Message.success(this.$t('message.savesuccess'));
+          this.$emit('close', true, !this.$utils.isEmpty(ciEntityList) ? ciEntityList[(ciEntityList.length - 1)].uuid : ''); // uuid 用于刷新数据
+        }
+      }).finally(() => {
+        this.isLoading = false;
+      });
+    }
+  },
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang="less" scoped></style>
diff --git a/src/views/pages/cmdb/newapplication/app-module-tree.vue b/src/views/pages/cmdb/newapplication/app-module-tree.vue
new file mode 100644
index 000000000..4e80e1628
--- /dev/null
+++ b/src/views/pages/cmdb/newapplication/app-module-tree.vue
@@ -0,0 +1,553 @@
+<template>
+  <div>
+    <div class="pr-sm" :class="alignType == 'table' ? 'pt-xs' : ''">
+      <InputSearcher
+        v-model="searchParam.keyword"
+        border="bottom"
+        :placeholder="$t('form.placeholder.keyword')"
+        @change="searchAppSystem()"
+      ></InputSearcher>
+    </div>
+    <div ref="scroll">
+      <Loading v-if="isLoading" :loadingShow="true" type="fix"></Loading>
+      <Scroll
+        :on-reach-bottom="pageRange[1] < pageCount ? handleReachBottom : null"
+        :on-reach-top="pageRange[0] > 1 ? handleReachTop : null"
+        :loading-text="loadingTip"
+        :height="scrollHeight"
+        :distance-to-edge="10"
+      >
+        <div v-for="app in appSystemList" :key="app.id">
+          <div class="app-item pl-xs pb-xs pt-xs cursor radius-sm overflow" :class="{ 'item-selected': !!app.isSelected }" @click="selectApp(app)">
+            <span v-if="(level === 'module' || level === 'env') && app.isHasModule">
+              <span v-if="!app.isLoading" :class="{ 'tsfont-drop-right': !app.isExpand, 'tsfont-drop-down': !!app.isExpand }" @click.stop="showModule(app)"></span>
+              <Icon
+                v-else
+                type="ios-loading"
+                size="16"
+                class="loading"
+              ></Icon>
+            </span>
+            <span v-else class="tsfont-dot"></span>
+            <Tooltip class="tooltip-box" :content="app.abbrName + '（' + app.name + '）'" :transfer="true">
+              <span class="name-pl overflow">{{ app.abbrName }}{{ app.name ? '(' + app.name + ')' : '' }}</span>
+            </Tooltip>
+          </div>
+          <div v-if="app.isExpand && app.appModuleList && app.appModuleList.length > 0">
+            <div v-for="module in app.appModuleList" :key="module.id">
+              <div class="module-item ml-nm pb-xs pt-xs radius-sm overflow cursor module-flex" :class="{ 'item-selected': !!module.isSelected }" @click="selectModule(app, module)">
+                <span v-if="level === 'env' && module.isHasEnv">
+                  <span v-if="!module.isLoading" :class="{ 'tsfont-drop-right': !module.isExpand, 'tsfont-drop-down': !!module.isExpand }" @click.stop="showEnv(app, module)"></span>
+                  <Icon
+                    v-else
+                    type="ios-loading"
+                    size="16"
+                    class="loading"
+                  ></Icon>
+                </span>
+                <span v-else-if="level === 'env' && !module.isHasEnv" class="tsfont-dot"></span>
+                <span v-else class="tsfont-application"></span>
+                <Tooltip class="tooltip-box" :content="module.abbrName + (module.name ? '（' + module.name + '）' : '')" :transfer="true">
+                  <span class="name-pl overflow">{{ module.abbrName }}{{ module.name ? '(' + module.name +')' : '' }}</span>
+                </Tooltip>
+              </div>
+              <div v-if="module.isExpand && module.envList && module.envList.length > 0" class="ml-nm pb-xs pt-xs">
+                <Tag
+                  v-for="env in module.envList"
+                  :key="env.id"
+                  :color="env.isSelected ? 'primary' : 'default'"
+                  class="cursor"
+                  @click.native="selectEnv(app, module, env)"
+                >
+                  {{ env.name }}
+                </Tag>
+              </div>
+            </div>
+          </div>
+        </div>
+      </Scroll>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    InputSearcher: () => import('@/resources/components/InputSearcher/InputSearcher.vue')
+  },
+  props: {
+    offsetTop: {
+      //顶部间距
+      type: Number,
+      default: 0
+    },
+    offsetBottom: {
+      //底部间距
+      type: Number,
+      default: 20
+    },
+    level: { type: String, default: 'module' }, //展示级别，分别是app,module和env
+    value: { type: Object },
+    allowInverse: { type: Boolean, default: true }, //是否允许反选，不允许默认会选中第一个节点
+    filter: {
+      // 过滤条件
+      type: Object,
+      default: function() {
+        return {};
+      }
+    },
+    alignType: {
+      // 输入框底边线和右边对齐
+      type: String,
+      default: 'table' // table / tag
+    }
+  },
+  data() {
+    return {
+      returnValue: this.value || {},
+      searchParam: { keyword: '', pageSize: 50, ...this.filter }, //pagesize生成50，防止浏览器高度太大数据量太少不出现滚动条导致无法触发翻页
+      pageCount: 0,
+      selectedNode: null,
+      appSystemList: [],
+      scrollHeight: 0,
+      loadingTip: this.$t('page.loadingtip'),
+      selectedApp: null,
+      selectedModule: null,
+      selectedEnv: null,
+      isShowAppEdit: false,
+      isLoading: false,
+      isSearching: false, //是否正在搜索，滚动分页避免冲突，禁止并发搜索
+      pageRange: [1, 1] //数据页范围，由于是滚动分页，需要记录页码范围
+    };
+  },
+  beforeCreate() {},
+  async created() {
+    await this.searchAppSystem();
+    window.addEventListener('resize', this.calcScrollHeight);
+  },
+  beforeMount() {},
+  mounted() {
+    setTimeout(() => {
+      this.calcScrollHeight();
+    }, 300);
+  },
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {
+    window.removeEventListener('resize', this.calcScrollHeight);
+  },
+  destroyed() {},
+  methods: {
+    //disableEmit为true,禁止触发外部搜索，只会改变节点的选中状态，此参数的目的是在回退后的首次加载中，避免连续触发两次搜索
+    async reSelectNode(disableEmit) {
+      let isHit = false;
+      if (!this.$utils.isEmpty(this.returnValue)) {
+        const appId = this.returnValue.appId;
+        const moduleId = this.returnValue.moduleId;
+        const envId = this.returnValue.envId;
+
+        if (appId && !moduleId && !envId) {
+          //选中应用
+          const appNode = this.appSystemList.find(d => d.id === appId);
+          if (appNode) {
+            if (!appNode.isSelected) {
+              this.selectApp(appNode, disableEmit);
+            }
+            isHit = true;
+          }
+        } else if (appId && moduleId && !envId) {
+          //选中模块
+          const appNode = this.appSystemList.find(d => d.id === appId);
+          if (appNode && !appNode.isExpand) {
+            await this.showModule(appNode);
+          }
+          if (appNode) {
+            const moduleNode = appNode.appModuleList.find(d => d.id === moduleId);
+            if (moduleNode) {
+              if (!moduleNode.isSelected) {
+                this.selectModule(appNode, moduleNode, disableEmit);
+              }
+              isHit = true;
+            }
+          }
+        } else if (appId && moduleId && envId) {
+          //选中环境
+          const appNode = this.appSystemList.find(d => d.id === appId);
+          if (appNode && !appNode.isExpand) {
+            await this.showModule(appNode);
+          }
+          if (appNode) {
+            const moduleNode = appNode.appModuleList.find(d => d.id === moduleId);
+            if (moduleNode && !moduleNode.isExpand) {
+              // await this.showEnv(appNode, moduleNode);
+            }
+            if (moduleNode) {
+              const envNode = moduleNode.envList.find(d => d.id === envId);
+              if (envNode) {
+                if (!envNode.isSelected) {
+                  this.selectEnv(appNode, moduleNode, envNode, disableEmit);
+                }
+                isHit = true;
+              }
+            }
+          }
+        }
+      }
+      if (!isHit) {
+        //找不到选中的值则清空当前选中数据
+        this.clearSelectedItem();
+        if (!this.allowInverse && this.appSystemList && this.appSystemList.length > 0) {
+          const app = this.appSystemList[0];
+          this.selectApp(app, disableEmit);
+        } else {
+          if (!disableEmit) {
+            this.emit();
+          }
+        }
+      }
+    },
+    calcScrollHeight() {
+      this.scrollHeight = document.body.clientHeight - this.$refs['scroll'].getBoundingClientRect().top - this.offsetBottom;
+    },
+    emit() {
+      this.$addHistoryData('appModuleEnvData', this.returnValue);
+      this.$emit('input', this.returnValue);
+      this.$emit('getSelectedApp', this.selectedApp);
+      this.$emit('getSelectedModule', this.selectedModule);
+      this.$emit('getSelectedEnv', this.selectedEnv);
+    },
+    restoreHistory(historyData) {
+      this.searchParam = historyData['searchParam'];
+      if (historyData['pageRange']) {
+        this.searchParam.pageRange = historyData['pageRange'];
+      }
+      this.returnValue = historyData['appModuleEnvData'] || {};
+    },
+    clearSelectedItem() {
+      if (this.selectedApp) {
+        this.$set(this.selectedApp, 'isSelected', false);
+        this.selectedApp = null;
+      }
+      if (this.selectedModule) {
+        this.$set(this.selectedModule, 'isSelected', false);
+        this.selectedModule = null;
+      }
+      if (this.selectedEnv) {
+        this.$set(this.selectedEnv, 'isSelected', false);
+        this.selectedEnv = null;
+      }
+      if (this.returnValue && this.returnValue.appId) {
+        this.$delete(this.returnValue, 'appId');
+      }
+      if (this.returnValue && this.returnValue.moduleId) {
+        this.$delete(this.returnValue, 'moduleId');
+      }
+      if (this.returnValue && this.returnValue.envId) {
+        this.$delete(this.returnValue, 'envId');
+      }
+    },
+    selectApp(app, disableEmit) {
+      if (app.isSelected) {
+        if (this.allowInverse) {
+          this.clearSelectedItem();
+        }
+      } else {
+        this.clearSelectedItem();
+        this.selectedApp = app;
+        this.$set(app, 'isSelected', true);
+        this.$set(this.returnValue, 'appId', app.id);
+        this.emit(); // 详情页返回，缺少分发方法
+      }
+      if (!disableEmit) {
+        this.emit();
+      }
+    },
+    selectModule(app, module, disableEmit) {
+      if (module.isSelected) {
+        if (this.allowInverse) {
+          this.clearSelectedItem();
+        }
+      } else {
+        this.clearSelectedItem();
+        this.selectedApp = app;
+        this.selectedModule = module;
+        this.$set(module, 'isSelected', true);
+        this.$set(this.returnValue, 'appId', app.id);
+        this.$set(this.returnValue, 'moduleId', module.id);
+        this.emit(); // 详情页返回，缺少分发的方法
+      }
+      if (!disableEmit) {
+        this.emit();
+      }
+    },
+    //提供给外部使用，用于刷新某个app下的所有节点（删除模块时使用）
+    async refreshAppByDelModule(appSystemId) {
+      if (appSystemId) {
+        await this.$api.cmdb.applicationManage.getAppmoduleListTree({ appSystemId: appSystemId }).then(res => {
+          const appModuleList = res.Return && !this.$utils.isEmpty(res.Return) ? res.Return : [];
+          const index = this.appSystemList.findIndex(d => d.id === appSystemId);
+          if (index > -1) {
+            this.$set(this.appSystemList[index], 'isHasModule', this.$utils.isEmpty(appModuleList) ? 0 : 1);
+            this.$set(this.appSystemList[index], 'appModuleList', appModuleList);
+          }
+          this.returnValue = {
+            appId: appSystemId
+          };
+          this.reSelectNode();
+        });
+      }
+    },
+    //提供给外部使用，用于刷新某个app下的所有节点（新增是使用）
+    async refreshApp(uuid) {
+      if (uuid) {
+        await this.$api.cmdb.applicationManage.getAppsystemById({ uuid: uuid }).then(res => {
+          const newAppNode = res.Return && !this.$utils.isEmptyObj(res.Return) ? res.Return : {};
+          const {id = null, abbrName = '', name = ''} = newAppNode;
+          const index = this.appSystemList.findIndex(d => d.id === id);
+          if (index > -1) {
+            const newAppObj = Object.assign(this.appSystemList[index], {id: id, name: name, abbrName: abbrName});
+            this.$set(this.appSystemList, index, newAppObj);
+            this.reSelectNode();
+          } else {
+            this.appSystemList.unshift(newAppNode); // 添加应用时，把应用放在数组第一个
+            this.selectApp(newAppNode);
+          }
+        });
+      }
+    },
+    //提供给外部使用，用于刷新某个module下的所有节点
+    async refreshModule(uuid, appSystemId) {
+      let moduleId = null;
+      if (uuid) {
+        await this.$api.cmdb.applicationManage.getAppmoduleById({ uuid: uuid }).then((res) => {
+          if (res && res.Status == 'OK' && res.Return) {
+            moduleId = res.Return.id;
+          }
+        });
+        const index = this.appSystemList.findIndex(d => d.id === appSystemId);
+        if (index > -1) {
+          await this.$api.cmdb.applicationManage.getAppmoduleListTree({ appSystemId: appSystemId }).then(res => {
+            const newModuleNode = res.Return && !this.$utils.isEmpty(res.Return) ? res.Return : [];
+            if (newModuleNode) {
+              this.$set(this.appSystemList[index], 'isHasModule', this.$utils.isEmpty(newModuleNode) ? 0 : 1); // 新加(删除)模块后，更新应用状态
+              this.$set(this.appSystemList[index], 'appModuleList', newModuleNode);
+              this.returnValue = {
+                appId: appSystemId,
+                moduleId: moduleId
+              };
+              this.reSelectNode();
+            }
+          });
+        }
+      }
+    },
+    selectEnv(app, module, env, disableEmit) {
+      if (env.isSelected) {
+        if (this.allowInverse) {
+          this.clearSelectedItem();
+        }
+      } else {
+        this.clearSelectedItem();
+        this.selectedApp = app;
+        this.selectedModule = module;
+        this.selectedEnv = env;
+        this.$set(env, 'isSelected', true);
+        this.$set(this.returnValue, 'appId', app.id);
+        this.$set(this.returnValue, 'moduleId', module.id);
+        this.$set(this.returnValue, 'envId', env.id);
+        this.emit(); // 详情页返回，缺少分发方法
+      }
+      if (!disableEmit) {
+        this.emit();
+      }
+    },
+    async showModule(app) {
+      if (!app.isExpand) {
+        this.$set(app, 'isLoading', true);
+        await this.$api.cmdb.applicationManage
+          .getAppmoduleListTree({ appSystemId: app.id })
+          .then(res => {
+            if (res.Status == 'OK') {
+              this.$set(app, 'appModuleList', res.Return);
+              this.$set(app, 'isExpand', true);
+            }
+          })
+          .finally(() => {
+            this.$set(app, 'isLoading', false);
+          });
+      } else {
+        this.$set(app, 'isExpand', false);
+      }
+    },
+    // async showEnv(app, module) { // 先注释，目前用不到，环境层数据
+    //   if (!module.isExpand) {
+    //     this.$set(module, 'isLoading', true);
+    //     let params = {
+    //       appSystemId: app.id,
+    //       appModuleId: module.id,
+    //       isHasEnv: 1
+    //     };
+    //     await this.$api.deploy.applicationConfig
+    //       .getEnvTreeList(params)
+    //       .then(res => {
+    //         if (res && res.Status == 'OK') {
+    //           const envList = res.Return || [];
+    //           this.$set(module, 'envList', envList);
+    //           this.$set(module, 'isExpand', true);
+    //         }
+    //       })
+    //       .finally(() => {
+    //         this.$set(module, 'isLoading', false);
+    //       });
+    //   } else {
+    //     this.$set(module, 'isExpand', false);
+    //   }
+    // },
+    async searchAppSystem(direction) {
+      if (!this.isSearching) {
+        this.isSearching = true;
+        if (!direction) {
+          this.isLoading = true;
+          this.searchParam.currentPage = 1;
+        } else if (direction === 'down') {
+          this.searchParam.currentPage = this.pageRange[1] + 1;
+        } else if (direction === 'up') {
+          this.searchParam.currentPage = Math.max(1, this.pageRange[0] - 1);
+          if (this.pageRange[0] === this.searchParam.currentPage) {
+            this.isSearching = false;
+            return; //如果已经是第一页，则不再搜索
+          }
+        }
+        this.$addHistoryData('searchParam', this.searchParam);
+        await this.$api.cmdb.applicationManage
+          .getAppsystemListTree(this.searchParam)
+          .then(async res => {
+            if (res && res.Status == 'OK') {
+              const dataList = res.Return.tbodyList || [];
+              this.pageCount = res.Return.pageCount;
+              const currentPage = Math.min(this.pageCount, this.searchParam.currentPage);
+              if (dataList && dataList.length > 0) {
+                if (this.level === 'module' || this.level === 'env') {
+                  dataList.forEach(element => {
+                    if (element.appModuleList && element.appModuleList.length > 0) {
+                      this.$set(element, 'isExpand', true);
+                    }
+                  });
+                }
+                let appSystemIdList = [];
+                this.appSystemList &&
+                  this.appSystemList.forEach(item => {
+                    appSystemIdList.push(item.id);
+                  });
+                if (!direction) {
+                  this.appSystemList = dataList;
+                  if (this.searchParam.pageRange) {
+                    //第一次搜索完毕后需要清除pageRange参数，并且把当前页面设回正确的值
+                    this.searchParam.currentPage = this.searchParam.pageRange[1];
+                    this.pageRange = this.searchParam.pageRange;
+                    this.$delete(this.searchParam, 'pageRange');
+                  } else {
+                    this.pageRange = [currentPage, currentPage];
+                  }
+                } else if (direction === 'down') {
+                  dataList &&
+                    dataList.forEach(item => {
+                      // 添加应用后，处理下拉数据重复问题
+                      if (!appSystemIdList.includes(item.id)) {
+                        this.appSystemList.push(item);
+                      }
+                    });
+                  this.pageRange[1] = currentPage;
+                } else if (direction === 'up') {
+                  dataList &&
+                    dataList.forEach(item => {
+                      // 添加应用后，处理下拉数据重复问题
+                      if (!appSystemIdList.includes(item.id)) {
+                        this.appSystemList.unshift(item);
+                      }
+                    });
+                  this.pageRange[0] = currentPage;
+                }
+              } else {
+                if (!direction) {
+                  this.appSystemList = [];
+                  this.pageRange = [currentPage, currentPage];
+                }
+              }
+              this.$emit('getAppSystemIdList', this.appSystemList);
+              //重新选中节点，禁用emit，防止触发二次搜索
+              await this.reSelectNode(true);
+            }
+          })
+          .finally(() => {
+            this.isSearching = false;
+            this.isLoading = false;
+            this.$addHistoryData('pageRange', this.pageRange);
+          })
+          .catch(() => {
+            this.$emit('getAppSystemIdList', []);
+          });
+      }
+    },
+    handleReachBottom() {
+      this.searchAppSystem('down');
+    },
+    handleReachTop() {
+      if (this.pageRange[0] > 1) {
+        this.searchAppSystem('up');
+      } else {
+        return false;
+      }
+    }
+  },
+  filter: {},
+  computed: {},
+  watch: {
+    height: {
+      handler(val) {
+        this.scrollHeight = val;
+      },
+      immediate: true
+    },
+    value: {
+      async handler(val) {
+        this.returnValue = val || {};
+        await this.reSelectNode();
+      },
+      deep: true
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+.app-item {
+  position: relative;
+  display: flex;
+}
+.app-item .favorite-icon {
+  position: absolute;
+  right: 0px;
+  visibility: hidden;
+}
+.app-item:hover .favorite-icon {
+  visibility: visible;
+}
+.name-pl {
+  display: inline-block;
+  width: 100%;
+  padding-left: 4px;
+  padding-right: 32px;
+}
+ .tooltip-box {
+    /deep/ &.ivu-tooltip,
+    /deep/ .ivu-tooltip-rel {
+      max-width: 100%;
+      width: 100%;
+    }
+}
+.module-flex {
+  display: flex;
+}
+</style>
diff --git a/src/views/pages/cmdb/newapplication/application-manage.vue b/src/views/pages/cmdb/newapplication/application-manage.vue
new file mode 100644
index 000000000..9fb6c6353
--- /dev/null
+++ b/src/views/pages/cmdb/newapplication/application-manage.vue
@@ -0,0 +1,253 @@
+<template>
+  <div>
+    <TsContain :siderWidth="220">
+      <template v-slot:topLeft>
+        <div class="action-group">
+          <span v-if="$AuthUtils.hasRole('RESOURCECENTER_MODIFY')" class="action-item tsfont-plus" @click="addApp()">{{ $t('page.apply') }}</span>
+          <span v-if="$AuthUtils.hasRole('RESOURCECENTER_MODIFY')" class="action-item tsfont-plus" @click="addAppModule()">{{ $t('page.module') }}</span>
+          <span class="action-item tsfont-plus" @click="addSettingDialog()">{{ $t('page.setting') }}</span>
+        </div>
+      </template>
+      <template v-slot:topRight>
+        <div v-if="$AuthUtils.hasRole('RESOURCECENTER_MODIFY') && selectedApp && !selectedModule" class="action-group">
+          <span class="action-item tsfont-edit" @click="editApp()">{{ $t('page.apply') }}</span>
+          <span class="action-item tsfont-trash-o" @click="deleteApp()">{{ $t('page.apply') }}</span>
+        </div>
+        <div v-else-if="$AuthUtils.hasRole('RESOURCECENTER_MODIFY')" class="action-group">
+          <span class="action-item tsfont-edit" @click="editAppModule()">{{ $t('page.module') }}</span>
+          <span class="action-item tsfont-trash-o" @click="deleteAppModule()">{{ $t('page.module') }}</span>
+        </div>
+      </template>
+      <template v-slot:sider>
+        <AppModuleTree
+          ref="appModuleTree"
+          v-model="appModueData"
+          :allowInverse="false"
+          @getSelectedApp="getSelectedApp"
+          @getSelectedModule="getSelectedModule"
+        ></AppModuleTree>
+      </template>
+      <template v-slot:content>
+        <Tabs v-model="tabValue" :animated="false" class="block-tabs">
+          <TabPane :label="$t('term.inspect.assetlist')" name="assetsList">
+            <AssetsManage
+              v-if="tabValue == 'assetsList'"
+              ref="assetsManage"
+              class="assets-manage-box"
+              :appSystemId="appSystemId"
+              :appModuleId="appModuleId"
+            ></AssetsManage>
+          </TabPane>
+          <TabPane v-if="selectedApp && !selectedModule" :label="$t('term.deploy.applicationinformation')" name="applicationInfo">
+            <AppInfo v-if="tabValue == 'applicationInfo'" :appSystemId="appSystemId"></AppInfo>
+          </TabPane>
+          <TabPane v-else :label="$t('term.deploy.moduleinformation')" name="moduleInfo">
+            <ModuleInfo
+              v-if="tabValue == 'moduleInfo'"
+              :isShowTitle="false"
+              :appSystemId="appSystemId"
+              :appModuleId="appModuleId"
+            ></ModuleInfo>
+          </TabPane>
+        </Tabs>
+      </template>
+    </TsContain>
+    <AppEditDialog
+      v-if="isEditAppDialogShow"
+      :ciEntityId="appCiEntityId"
+      :ciId="appCiId"
+      @close="closeAppEditDialog"
+    ></AppEditDialog>
+    <AppModuleEditDialog
+      v-if="isEditAppModuleDialogShow"
+      :ciEntityId="appModuleCiEntityId"
+      :ciId="appModuleCiId"
+      :ciEntityData="ciEntityData"
+      @close="closeAppModuleEditDialog"
+    ></AppModuleEditDialog>
+    <DeleteCiEntityDialog
+      v-if="isDeleteDialogShow"
+      :allowDelete="true"
+      :allowCommit="true"
+      :ciEntityId="deleteCiEntityId"
+      @close="closeDeleteDialog"
+    ></DeleteCiEntityDialog>
+    <CiAttrSettingDialog v-if="isSettingDialogShow" @close="closeSettingDialog"></CiAttrSettingDialog>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    AppInfo: () => import('@/views/pages/deploy/application-config/config/app/app-info.vue'),
+    ModuleInfo: () => import('@/views/pages/deploy/application-config/config/module/module-info'),
+    AppEditDialog: () => import('./app-edit-dialog.vue'),
+    AppModuleEditDialog: () => import('./appmodule-edit-dialog.vue'),
+    DeleteCiEntityDialog: () => import('../cientity/cientity-delete-dialog.vue'),
+    AssetsManage: () => import('./assets-manage'), // 资产清单
+    AppModuleTree: () => import('./app-module-tree'), // 应用模块树
+    CiAttrSettingDialog: () => import('./ci-attr-setting-dialog.vue')
+  },
+  props: {},
+  data() {
+    return {
+      tabValue: '',
+      isApp: true,
+      isEditAppDialogShow: false,
+      isEditAppModuleDialogShow: false,
+      isDeleteDialogShow: false,
+      appCiEntityId: null,
+      appCiId: null,
+      appSystemId: null, // 系统id
+      appModuleCiId: null,
+      appModuleId: null,
+      deleteCiEntityId: null,
+      selectedApp: null,
+      selectedModule: null,
+      appModueData: {},
+      ciEntityData: {}, // 添加模块时，用于锁定应用
+      isSettingDialogShow: false 
+
+    };
+  },
+  beforeCreate() {},
+  created() {
+    this.getResourceEntity();
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    getSelectedApp(app) {
+      this.selectedApp = app;
+      this.appCiEntityId = app ? app.id : null;
+      this.appSystemId = app ? app.id : null;
+      this.tabValue = 'assetsList';
+    },
+    getSelectedModule(module) {
+      this.selectedModule = module;
+      this.appModuleId = module ? module.id : null;
+      this.tabValue = 'assetsList';
+    },
+    addApp() {
+      this.appCiEntityId = null;
+      this.isEditAppDialogShow = true;
+    },
+    editApp() {
+      this.appCiEntityId = this.selectedApp ? this.selectedApp.id : null;
+      this.isEditAppDialogShow = true;
+    },
+    editAppModule() {
+      this.ciEntityData = {};
+      this.appModuleCiEntityId = this.appModuleId;
+      this.isEditAppModuleDialogShow = true;
+    },
+    async addAppModule() {
+      await this.getRelEntityData();
+      this.appModuleCiEntityId = null;
+      this.isEditAppModuleDialogShow = true;
+    },
+    deleteApp() {
+      this.deleteCiEntityId = this.appSystemId;
+      this.isDeleteDialogShow = true;
+    },
+    deleteAppModule() {
+      this.deleteCiEntityId = this.appModuleId;
+      this.isDeleteDialogShow = true;
+    },
+    closeAppEditDialog(needRefresh, uuid) {
+      this.isEditAppDialogShow = false;
+      if (needRefresh && uuid) {
+        // 添加应用成功，刷新树列表
+        this.$refs.appModuleTree.refreshApp(uuid);
+      }
+    },
+    closeAppModuleEditDialog(needRefresh, uuid) {
+      this.isEditAppModuleDialogShow = false;
+      if (needRefresh && uuid) {
+        // 添加编辑模块成功，刷新树列表
+        this.$refs.appModuleTree.refreshModule(uuid, this.appSystemId);
+      }
+    },
+    closeDeleteDialog(needRefresh) {
+      this.isDeleteDialogShow = false;
+      if (needRefresh) {
+        if (this.appModuleId) {
+          // 删除模块后，刷新树列表
+          this.$refs.appModuleTree.refreshAppByDelModule(this.appSystemId);
+        } else if (this.appSystemId) {
+          // 删除应用成功，刷新树列表
+          this.$refs.appModuleTree.searchAppSystem();
+        }
+      }
+    },
+    getResourceEntity() {
+      this.$api.cmdb.applicationManage.getResourceEntityByName('scence_appsystem').then(res => {
+        if (res.Return && res.Return.ciId) {
+          this.appCiId = res.Return.ciId;
+        }
+      });
+      this.$api.cmdb.applicationManage.getResourceEntityByName('scence_appmodule').then(res => {
+        if (res.Return && res.Return.ciId) {
+          this.appModuleCiId = res.Return.ciId;
+        }
+      });
+    },
+    async getRelEntityData() {
+      // 设置添加模块时，默认选中当前应用
+      this.ciEntityData = {};
+      if (this.appModuleCiId) {
+        let relList = [];
+        let relEntityData = {};
+        await this.$api.cmdb.ci
+          .getRelByCiId(this.appModuleCiId, {
+            needAction: false,
+            showType: 'all'
+          })
+          .then(res => {
+            relList = res.Return || [];
+            relList.forEach(element => {
+              if ((element.direction === 'from' && element.fromCiId == this.appModuleCiId && element.toCiId == this.appCiId) || (element.direction === 'to' && element.toCiId == this.appModuleCiId && element.fromCiId == this.appCiId)) {
+                relEntityData[`rel${element.direction}_${element.id}`] = {
+                  valueList: [
+                    {
+                      ciEntityName: this.selectedApp.name, // 应用层的name
+                      ciEntityId: this.selectedApp.id, // 应用的id
+                      ciId: this.appModuleCiId
+                    }
+                  ]
+                };
+              }
+            });
+            this.ciEntityData = { uuid: this.$utils.setUuid(), relEntityData: relEntityData };
+          });
+      }
+    },
+    addSettingDialog() {
+      this.isSettingDialogShow = true;
+    },
+    closeSettingDialog(needRefresh) {
+      this.isSettingDialogShow = false;
+      if (needRefresh) {
+        if (this.tabValue === 'assetsList') {
+          this.$refs.assetsManage.initData();
+        }
+      }
+    }
+  },
+  filter: {},
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang="less" scoped>
+.assets-manage-box {
+  height: calc(100vh - 100px - 50px); // 100 通栏的表头+导航栏， 50是（tab(高度)+16(底部的间距)
+  overflow-y: auto;
+}
+</style>
diff --git a/src/views/pages/cmdb/newapplication/appmodule-edit-dialog.vue b/src/views/pages/cmdb/newapplication/appmodule-edit-dialog.vue
new file mode 100644
index 000000000..0876ca9e6
--- /dev/null
+++ b/src/views/pages/cmdb/newapplication/appmodule-edit-dialog.vue
@@ -0,0 +1,87 @@
+<template>
+  <TsDialog v-bind="setting" :isShow="true" @on-close="close">
+    <div>
+      <Loading
+        v-if="isLoading"
+        :text="$t('page.datasaving')"
+        :loadingShow="isLoading"
+        type="fix"
+      ></Loading>
+      <EditCiEntity
+        ref="editContainer"
+        mode="dialog"
+        :propCiId="ciId"
+        :propCiEntityId="ciEntityId"
+        :propCiEntityData="ciEntityData"
+        :isRequired="1"
+        saveMode="emit"
+        :hideHeader="true"
+        @save="save"
+        @cancel="close"
+      ></EditCiEntity>
+    </div>
+  </TsDialog>
+</template>
+<script>
+import EditCiEntity from '@/views/pages/cmdb/cientity/cientity-edit.vue';
+export default {
+  name: '',
+  components: {
+    EditCiEntity
+  },
+  filters: {},
+  props: {
+    ciId: {
+      type: Number
+    },
+    ciEntityId: {
+      type: Number
+    },
+    ciEntityData: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      isLoading: false,
+      setting: {
+        title: this.ciEntityId ? '编辑应用模块' : '添加应用模块',
+        maskClose: false,
+        width: 'large',
+        hasFooter: false
+      }
+    };
+  },
+  beforeCreate() {},
+  created() {
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    close() {
+      this.$emit('close');
+    },
+    save(ciEntityList) {
+      this.isLoading = true;
+      this.$api.cmdb.cientity.batchSaveCiEntity({ciEntityList: ciEntityList, needCommit: true}).then(res => {
+        if (res.Status == 'OK') {
+          this.$Message.success(this.$t('message.savesuccess'));
+          this.$emit('close', true, !this.$utils.isEmpty(ciEntityList) ? ciEntityList[0].uuid : '');
+        }
+      }).finally(() => {
+        this.isLoading = false;
+      });
+    }
+  },
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang="less" scoped></style>
diff --git a/src/views/pages/cmdb/newapplication/assets-manage.vue b/src/views/pages/cmdb/newapplication/assets-manage.vue
new file mode 100644
index 000000000..6faf06987
--- /dev/null
+++ b/src/views/pages/cmdb/newapplication/assets-manage.vue
@@ -0,0 +1,281 @@
+<template>
+  <div class="assets-manage-wrap padding">
+    <Loading :loadingShow="loadingShow" type="fix"></Loading>
+    <div v-if="envList && envList.length > 0" class="pb-sm li-box">
+      <Row :gutter="16">
+        <Col
+          v-for="item in envList"
+          :key="item.id"
+          :xs="12"
+          :sm="8"
+          :md="6"
+          :lg="4"
+          :xl="3"
+          :xxl="2"
+        >
+          <div
+            v-if="item.name"
+            class="li-item text-action"
+            :class="envId == item.id ? 'li-active li-text border-primary' : 'border-base bg-op'"
+            @click="selectedEnv(item.name)"
+          >{{ item.name }}</div>
+        </Col>
+      </Row>
+    </div>
+    <div v-if="tableList && tableList.length > 0 ">
+      <div v-for="(item, index) in tableList" :key="index">
+        <div class="h3 padding-sm">{{ item.type.label }}</div>
+        <TsTable
+          :fixedHeader="false"
+          :theadList="item.theadList"
+          v-bind="filterTypeFields(item)"
+          @changeCurrent="(currentPage) => changeCurrent(currentPage, item, index)"
+          @changePageSize="(pageSize) => changePageSize(pageSize,item, index)"
+        >
+          <template v-slot:ip="{ row }">
+            <span class="text-href" @click="toCientityView(row)">
+              <span>{{ row.ip }}</span>
+              <span v-if="row.port">:{{ row.port }}</span>
+            </span>
+          </template>
+          <template v-slot:monitorStatus="{ row }">
+            <!-- 监控状态 -->
+            <span v-if="row.monitorStatusJson && row.monitorTime" :title="row.monitorTime | formatDate">
+              <span :class="[row.monitorStatusJson.cssClass, {'background-FATAL': row.monitorStatusJson.value== 'FATAL'}]" class="vertical cursor">{{ row.monitorStatusJson.text }} </span>
+              <span class="text-title">
+                {{ handleTimes(row.monitorTime) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
+              </span>
+            </span>
+            <span v-else>
+              <span>-</span>
+            </span>
+          </template>
+          <template v-slot:inspectStatus="{ row }">
+            <!-- 巡检状态 -->
+            <span v-if="row.inspectStatusJson && row.inspectTime" :title="row.inspectTime | formatDate">
+              <span :class="[row.inspectStatusJson.cssClass, {'background-FATAL': row.inspectStatusJson.value== 'FATAL'}]" class="vertical cursor" @click="toInspectStatusDetail(row)">{{ row.inspectStatusJson.text }} </span>
+              <span class="text-title">
+                {{ handleTimes(row.inspectTime) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
+              </span>
+            </span>
+            <span v-else>-</span>
+          </template>
+          <template v-slot:bgList="{ row }">
+            <GroupList :dataList="row.bgList" type="tag" textName="bgName"></GroupList>
+          </template>
+          <template v-slot:ownerList="{ row }">
+            <GroupList :dataList="row.ownerList" type="tag" textName="userName"></GroupList>
+          </template>
+          <template v-slot:clusterName="{row}">
+            <!-- 所在集群 -->
+            <span v-if="row" class="text-href" @click="gotoCluster(row)">{{ row.clusterName }}</span>
+          </template>
+        </TsTable>
+      </div>
+    </div>
+    <NoData v-else></NoData>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    GroupList: () => import('@/resources/components/GroupList/GroupList.vue'),
+    TsTable: () => import('@/resources/components/TsTable/TsTable.vue')
+  },
+  filters: {},
+  props: {
+    appSystemId: {
+      type: Number,
+      default: null
+    },
+    appModuleId: {
+      type: Number,
+      default: null
+    },
+    moduleName: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      loadingShow: false,
+      envId: '',
+      envList: [],
+      tableList: [],
+      tableData: {
+        tbodyList: [],
+        rowNum: 0,
+        pageSize: 20,
+        currentPage: 1
+      },
+      theadList: [
+        { key: 'ip', title: this.$t('page.ipaddress')},
+        { key: 'name', title: this.$t('page.name')},
+        { key: 'monitorStatus', title: this.$t('term.inspect.monitoringstate')},
+        { key: 'inspectStatus', title: this.$t('term.autoexec.inspectstatus')},
+        { key: 'stateName', title: this.$t('term.autoexec.assetstatus')},
+        { key: 'envName', title: this.$t('term.inspect.envname')},
+        { key: 'clusterName', title: this.$t('term.inspect.clustername')},
+        { key: 'dataCenterName', title: this.$t('term.inspect.datacenter')},
+        { key: 'networkArea', title: this.$t('page.networkarea')},
+        { key: 'ownerList', title: this.$t('page.owner')},
+        { key: 'bgList', title: this.$t('term.autoexec.subordinatedepartment')},
+        { key: 'maintenanceWindow', title: this.$t('term.deploy.maintenancewindow')}
+      ]
+    };
+  },
+  beforeCreate() {},
+  async created() {
+    await this.initData();
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    restoreHistory(historyData) {
+      this.envId = historyData['envId'];
+    },
+    filterTypeFields(row) {
+      // 过滤类型字段，修复控制台报错问题
+      let currentRow = this.$utils.deepClone(row);
+      if (currentRow && currentRow.hasOwnProperty('type')) {
+        delete currentRow.type;
+      }
+      return currentRow;
+    },
+    changeCurrent(currentPage, item, index) {
+      this.tableData.currentPage = currentPage;
+      this.getTableData(item, index);
+    },
+    changePageSize(pageSize, item, index) {
+      this.tableData.pageSize = pageSize;
+      this.getTableData(item, index);
+    },
+    async initData() {
+      await this.getEnvList();
+      await this.getTableData();
+    },
+    async getEnvList() {
+      this.loadingShow = true;
+      await this.$api.cmdb.applicationManage.getEnvironmenteList().then(res => {
+        if (res.Status == 'OK') {
+          this.envList = res.Return?.tbodyList || [];
+          this.envList.unshift({
+            name: this.$t('term.inspect.allenv'),
+            id: ''
+          });
+          this.envList.push({
+            name: this.$t('term.inspect.noconfigenv'),
+            id: -2
+          });
+          this.envId = this.envId || '';
+        }
+      }).finally(() => {
+        this.loadingShow = false;
+      });
+    },
+    getTableData(row, index) {
+      let currentRow = {};
+      let params = {
+        appSystemId: this.appSystemId,
+        appModuleId: this.appModuleId,
+        envId: this.envId,
+        typeId: row && row.type ? row.type.id : null,
+        currentPage: this.tableData.currentPage,
+        pageSize: this.tableData.pageSize
+      };
+      this.$addHistoryData('envId', this.envId);
+      if (this.$utils.isEmpty(this.appSystemId) && this.$utils.isEmpty(this.appModuleId)) {
+        this.tableList = [];
+        return false;
+      }
+      this.loadingShow = true;
+      this.$api.cmdb.applicationManage.getAppResourceList(params).then(res => {
+        if (res.Status == 'OK') {
+          if (row && !this.$utils.isEmptyObj(row)) {
+            // 内嵌列表翻页
+            let tableList = (res.Return && res.Return.tableList) ? res.Return.tableList[0] : [];
+            currentRow = Object.assign({}, row, tableList);
+            this.$set(this.tableList, index, currentRow);
+          } else {
+            this.tableList = res.Return.tableList;
+          }
+        }
+      }).finally(() => {
+        this.loadingShow = false;
+      });
+    },
+    gotoCluster(row) {
+      // 集群跳转
+      if (row && !this.$utils.isEmptyObj(row)) {
+        this.$router.push({ path: './ci/' + row.clusterTypeId + '/cientity-view/' + row.clusterId });
+      }
+    },
+    toCientityView(row) {
+      // 应用清单详情
+      if (row && !this.$utils.isEmptyObj(row)) {
+        this.$router.push({ path: './ci/' + row.typeId + '/cientity-view/' + row.id });
+      }
+    },
+    toInspectStatusDetail(row) {
+      // 巡检状态详情
+      if (row && !this.$utils.isEmptyObj(row)) {
+        if (this.moduleName == 'inspect') {
+          // inspect模块
+          this.$router.push({ path: './assets-detail-' + row.id});
+        } else {
+          // cmdb模块
+          this.$router.push({ path: './inspect-status-detail-' + row.id});
+        }
+      }
+    },
+    selectedEnv(name) {
+      let envId = null;
+      this.envList.forEach(v => {
+        if (v.name == name) {
+          envId = v.id;
+        }
+      });
+      this.envId = envId;
+      this.getTableData();
+    },
+    handleTimes(time) {
+      let data = '-';
+      if (time) {
+        data = Date.parse(new Date()) - time;
+      }
+      return data;
+    }
+  },
+  computed: {},
+  watch: {
+    appSystemId() {
+      this.initData();
+    },
+    appModuleId() {
+      this.initData();
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+.assets-manage-wrap {
+  .li-box {
+    margin-bottom: -10px;
+  .li-item {
+    padding: 6px 16px;
+    border-radius: 4px;
+    text-align: center;
+    margin-bottom: 10px;
+  }
+ }
+}
+
+</style>
diff --git a/src/views/pages/cmdb/newapplication/automation.vue b/src/views/pages/cmdb/newapplication/automation.vue
new file mode 100644
index 000000000..3a0190702
--- /dev/null
+++ b/src/views/pages/cmdb/newapplication/automation.vue
@@ -0,0 +1,152 @@
+<template>
+  <TsDialog v-bind="dialogConfig" @on-close="close" @on-ok="save">
+    <template v-slot:header>
+      <div v-if="tableData.id">{{ $t('dialog.title.edittarget',{'target':$t('page.account')}) }}</div>
+      <div v-if="!tableData.id">{{ $t('dialog.title.addtarget',{'target':$t('page.account')}) }}</div>
+    </template>
+    <template v-slot>
+      <TsForm ref="form" :item-list="formConfig"></TsForm>
+    </template>
+  </TsDialog>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    TsForm: () => import('@/resources/plugins/TsForm/TsForm')
+  },
+  filters: {},
+  props: {
+    id: { type: Number }
+  },
+  data() {
+    let _this = this;
+    return {
+      dialogConfig: {
+        type: 'modal',
+        isShow: true
+      },
+      tableData: {},
+      formConfig: {
+        id: {
+          type: 'text',
+          name: 'id',
+          isHidden: true
+        },
+        name: {
+          type: 'text',
+          name: 'name',
+          label: this.$t('page.name'),
+          maxlength: 50,
+          validateList: [{ name: 'required', message: this.$t('form.placeholder.pleaseinput', {'target': this.$t('page.name')}), url: '/api/rest/resourcecenter/account/save', key: 'name' }, 'name-special']
+        },
+        account: {
+          type: 'text',
+          name: 'account',
+          label: this.$t('page.username'),
+          maxlength: 50,
+          validateList: [{ name: 'required', message: this.$t('form.placeholder.pleaseinput', {'target': this.$t('page.username')}) }]
+        },
+        password: {
+          type: 'password',
+          name: 'password',
+          showPassword: true,
+          label: this.$t('page.password'),
+          maxlength: 50,
+          validateList: [{ name: 'required', message: this.$t('form.placeholder.pleaseinput', {'target': this.$t('page.password')}) }]
+        },
+        protocol: {
+          type: 'select',
+          label: this.$t('term.inspect.connectionagreement'),
+          value: '',
+          multiple: false,
+          transfer: true,
+          url: 'api/rest/universal/enum/get',
+          params: { enumClass: 'neatlogic.framework.cmdb.enums.resourcecenter.Protocol' },
+          validateList: [{ name: 'required', message: this.$t('form.placeholder.pleaseselect', {'target': this.$t('term.inspect.connectionagreement')}) }],
+          onChange: function(val) {
+            if (val === 'ssh') {
+              _this.formConfig.port.isHidden = false;
+            } else {
+              _this.formConfig.port.isHidden = true;
+            }
+          }
+        },
+        port: {
+          type: 'text',
+          name: 'port',
+          label: this.$t('page.port'),
+          multiple: false,
+          value: '',
+          maxlength: 50,
+          validateList: [
+            { name: 'required', message: this.$t('form.placeholder.pleaseinput', {'target': this.$t('page.port')}) },
+            { name: 'port', message: this.$t('message.pleaseentertruetarget', {target: this.$t('page.portnumber')}) }
+          ],
+          isHidden: true
+        }
+      }
+    };
+  },
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {
+    this.getAccountType();
+  },
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    save() {
+      const form = this.$refs['form'];
+      let data = this.$refs.form.getFormValue();
+      if (!form.valid()) {
+        return;
+      }
+      this.$api.cmdb.accountmanage
+        .saveAccount(data)
+        .then(res => {
+          if (res.Status == 'OK') {
+            this.$Message.success(this.$t('message.savesuccess'));
+            this.close(true);
+          }
+        })
+        .catch(error => {
+          if (error.data.Message) {
+            this.$Message.error(error.data.Message);
+          } else {
+            this.$Message.error(this.$t('message.savefailed'));
+          }
+        });
+    },
+    close: function(needRefresh) {
+      this.$emit('close', needRefresh);
+    },
+    getAccountType() {
+      // this.formConfig.password.showPassword = false;
+      if (this.id) {
+        this.$api.accountmanage.getAccountById(this.id).then(res => {
+          this.tableData = res.Return;
+          for (let key in this.formConfig) {
+            this.$set(this.formConfig[key], 'value', this.tableData[key]);
+          }
+          // this.formConfig.forEach(element => {
+          //   this.$set(element, 'value', this.tableData[element.name]);
+          // });
+        });
+      } else {
+        this.tableData = {};
+        for (let key in this.formConfig) {
+          this.$set(this.formConfig[key], 'value', this.tableData[key]);
+        }
+      }
+    }
+  },
+  computed: {},
+  watch: {}
+};
+</script>
diff --git a/src/views/pages/cmdb/newapplication/ci-attr-setting-dialog.vue.vue b/src/views/pages/cmdb/newapplication/ci-attr-setting-dialog.vue.vue
new file mode 100644
index 000000000..bf96211c3
--- /dev/null
+++ b/src/views/pages/cmdb/newapplication/ci-attr-setting-dialog.vue.vue
@@ -0,0 +1,151 @@
+<template>
+  <TsDialog
+    v-bind="setting"
+    :isShow="true"
+    :loading="isSaveLoading"
+    @on-close="close"
+    @on-ok="save"
+  >
+    <div>
+      <div>
+        <Button class="mb-sm" @click="addData()">{{ $t('term.pbc.adddata') }}</Button>
+      </div>
+      <div v-for="(item,index) in tableSettingList" :key="index" class="pb-xs">
+        <TsRow :gutter="8">
+          <Col span="10">
+            <TsFormTree
+              ref="formItem"
+              v-model="item.ciName"
+              v-bind="treeConfig"
+            ></TsFormTree>
+          </Col>
+          <Col span="12">
+            <TsFormSelect
+              ref="formItem"
+              v-model="item.fieldList"
+              v-bind="attrConfig"
+              class="mr-sm"
+            ></TsFormSelect>
+          </Col>
+          <Col span="2">
+            <span class="text-action tsfont-plus pr-xs" @click="addData(index+1)"></span>
+            <span class="text-action tsfont-minus" @click="deleteItem(index)"></span>
+          </Col>
+        </TsRow>
+      </div>
+    </div>
+  </TsDialog>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    TsFormTree: () => import('@/resources/plugins/TsForm/TsFormTree'),
+    TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect')
+  },
+  filters: {},
+  props: {
+   
+  },
+  data() {
+    return {
+      id: null,
+      config: {},
+      tableSettingList: [],
+      setting: {
+        title: '设置',
+        width: 'medium'
+      },
+      treeConfig: {
+        url: '/api/rest/resourcecenter/resourcetype/tree',
+        valueName: 'name',
+        textName: 'label',
+        transfer: true,
+        showPath: true,
+        search: true,
+        border: 'border',
+        validateList: ['required']
+      },
+      attrConfig: {
+        url: '/api/rest/resourcecenter/assetlist/theadlist',
+        rootName: 'tbodyList',
+        textName: 'text',
+        valueName: 'value',
+        multiple: true,
+        transfer: true,
+        border: 'border',
+        validateList: ['required']
+      },
+      isSaveLoading: false
+    };
+  },
+  beforeCreate() {},
+  created() {
+    this.getApplicationlistSetting();
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    getApplicationlistSetting() {
+      this.$api.cmdb.applicationManage.getApplicationlistSetting().then(res => {
+        if (res.Status == 'OK') {
+          this.id = res.Return.id || null;
+          this.config = res.Return.config || {};
+          this.tableSettingList = this.config.tableSettingList || [];
+        }
+      });
+    },
+    addData(index) {
+      if (index) {
+        this.tableSettingList.splice(index, 0, { ciName: '', fieldList: [] });
+      } else {
+        this.tableSettingList.push({ ciName: '', fieldList: [] });
+      }
+    },
+    deleteItem(index) {
+      this.tableSettingList.splice(index, 1);
+    },
+    close() {
+      this.$emit('close');
+    },
+    save() {
+      let formItems = this.$refs.formItem;
+      let isValid = true;
+      formItems.forEach(item => {
+        if (item.valid && !item.valid()) {
+          isValid = false;
+        }
+      });
+      if (!isValid) {
+        return;
+      }
+      this.isSaveLoading = true;
+      let data = {
+        config: {
+          tableSettingList: this.tableSettingList
+        }
+      };
+      if (this.id) {
+        data.id = this.id;
+      }
+      this.$api.cmdb.applicationManage.saveApplicationlistSetting(data).then(res => {
+        if (res.Status == 'OK') {
+          this.$Message.success(this.$t('message.savesuccess'));
+          this.$emit('close', true);
+        }
+      }).finally(() => {
+        this.isSaveLoading = false;
+      });
+    }
+  },
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang="less" scoped></style>
diff --git a/src/views/pages/cmdb/newapplication/inspect-status-detail.vue b/src/views/pages/cmdb/newapplication/inspect-status-detail.vue
new file mode 100644
index 000000000..86d48f6de
--- /dev/null
+++ b/src/views/pages/cmdb/newapplication/inspect-status-detail.vue
@@ -0,0 +1,34 @@
+<template>
+  <div>
+    <AssetsInspectDetail></AssetsInspectDetail>
+  </div>
+</template>
+<script>
+import AssetsInspectDetail from '@/views/pages/inspect/assetsInspect/assets-detail';
+export default {
+  name: '',
+  components: {
+    AssetsInspectDetail
+  },
+  props: {},
+  data() {
+    return {};
+  },
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {},
+  filter: {},
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang="less">
+</style>
diff --git a/src/views/pages/cmdb/router.js b/src/views/pages/cmdb/router.js
index 780efcae8..c14905af0 100644
--- a/src/views/pages/cmdb/router.js
+++ b/src/views/pages/cmdb/router.js
@@ -21,6 +21,7 @@ const customViewManage = () => import('./customview/customview-manage.vue');
 const assetManage = () => import('./asset/asset-manage.vue');
 const accountManage = () => import('./account/account-manage.vue');
 const applicationManage = () => import('./application/application-manage.vue');
+const newApplicationManage = () => import('./newapplication/application-manage.vue'); //新的应用清单
 const tagManage = () => import('./Tag/tag-manage.vue');
 const syncCiCollectionManage = () => import('./sync/sync-manage.vue');
 //const syncWizard = () => import('./sync/sync-wizard.vue');
@@ -144,6 +145,18 @@ let routerArr = [
       authority: ['AUTOEXEC_BASE', 'DEPLOY_BASE', 'INSPECT_BASE', 'DR_BASE'] //只有cmdb模块权限不显示
     }
   },
+  {
+    path: '/new-application-manage',
+    name: 'new-application-manage',
+    component: newApplicationManage,
+    meta: {
+      type: 'resourceCenter',
+      title: '新的应用清单',
+      ismenu: true,
+      icon: 'tsfont-app',
+      authority: ['AUTOEXEC_BASE', 'DEPLOY_BASE', 'INSPECT_BASE', 'DR_BASE'] //只有cmdb模块权限不显示
+    }
+  }, 
   {
     path: '/asset-manage',
     name: 'asset-manage',
-- 
Gitee


From 68dd4a2feb21ae52129f6634c9e24cabd942df51 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Fri, 21 Feb 2025 17:33:32 +0800
Subject: [PATCH 07/20] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B9=E7=AE=A1=E7=90=86-=E8=B5=84=E4=BA=A7=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E8=B0=83=E6=95=B4=20=20-=20[=E5=85=B3=E8=81=94]=20#[1?=
 =?UTF-8?q?349157963399168]CMDB=E5=BA=94=E7=94=A8=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E6=A8=A1=E5=9E=8B=E5=B1=82=E7=BA=A7=E5=8F=AF?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=20http://192.168.0.96:8090/demo/rdm.html#/st?=
 =?UTF-8?q?ory-detail/939050947543040/939050947543042/1349157963399168?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resource/resourceentity/resourceentity.js |   9 +
 .../pages/cmdb/asset/components/tree-edit.vue | 167 +++++++++++-------
 2 files changed, 108 insertions(+), 68 deletions(-)

diff --git a/src/resources/api/cmdb/resource/resourceentity/resourceentity.js b/src/resources/api/cmdb/resource/resourceentity/resourceentity.js
index d0a043521..02f17f3f4 100644
--- a/src/resources/api/cmdb/resource/resourceentity/resourceentity.js
+++ b/src/resources/api/cmdb/resource/resourceentity/resourceentity.js
@@ -14,6 +14,15 @@ const resourceentity = {
   },
   getResourceEntityViewDataList(params) {
     return axios.post('/api/rest/resourcecenter/resourceentity/viewdata/list', params);
+  },
+  getAssetlist() {
+    return axios.post('/api/rest/resourcecenter/assetlist/display/get', {});
+  },
+  getResourcetypeTree(params) {
+    return axios.post('/api/rest/resourcecenter/resourcetype/listtree', params);
+  },
+  saveAssetlistData(params) {
+    return axios.post('/api/rest/resourcecenter/assetlist/display/save', params);
   }
 };
 export default resourceentity;
diff --git a/src/views/pages/cmdb/asset/components/tree-edit.vue b/src/views/pages/cmdb/asset/components/tree-edit.vue
index 05f909f60..e0cdfac50 100644
--- a/src/views/pages/cmdb/asset/components/tree-edit.vue
+++ b/src/views/pages/cmdb/asset/components/tree-edit.vue
@@ -1,14 +1,32 @@
-
 <template>
   <TsDialog v-bind="dialogConfig" @on-close="close">
     <template v-slot>
-      <div v-if="!topCi">
-        <span>{{ $t('term.cmdb.resourcetypetreenosettingdesc') }}</span>
-        <br>
-        <a class="text-href" href="javascript:void(0);" @click.stop="gotoResourceentityManagePage()">{{ $t('term.cmdb.gotoresourceentitymanagepage') }}</a>
+      <div v-if="isReady">
+        <div v-if="$utils.isEmpty(tbodyList)">
+          <span>{{ $t('term.cmdb.resourcetypetreenosettingdesc') }}</span>
+          <br>
+          <a class="text-href" href="javascript:void(0);" @click.stop="gotoResourceentityManagePage()">{{ $t('term.cmdb.gotoresourceentitymanagepage') }}</a>
+        </div>
+        <TsFormItem :label="$t('term.cmdb.ci')" required>
+          <TsRow :gutter="8">
+            <Col span="8">
+              <TsFormTree
+                ref="formTree"
+                v-model="formData.rootCiName"
+                v-bind="treeConfig"
+              ></TsFormTree>
+            </Col>
+            <Col span="14">
+              <TsFormSelect
+                ref="formItem"
+                v-model="formData.fieldList"
+                v-bind="attrConfig"
+                class="mr-sm"
+              ></TsFormSelect>
+            </Col>
+          </TsRow>
+        </TsFormItem>
       </div>
-      <TsForm v-if="topCi && topCi.id" ref="form" :item-list="formConfig">
-      </TsForm>
     </template>
     <template v-slot:footer>
       <Button @click="close()">{{ $t('page.cancel') }}</Button>
@@ -20,7 +38,9 @@
 export default {
   name: '',
   components: {
-    TsForm: () => import('@/resources/plugins/TsForm/TsForm')
+    TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect'),
+    TsFormTree: () => import('@/resources/plugins/TsForm/TsFormTree'),
+    TsFormItem: () => import('@/resources/plugins/TsForm/TsFormItem')
   },
   props: {
     ciId: {
@@ -30,56 +50,55 @@ export default {
   data() {
     const _this = this;
     return {
-      formData: {
-        ciId: this.ciId
-      },
-      topCi: {
-        id: null,
-        name: null,
-        label: null
-      },
+      isReady: false,
+      id: null,
+      formData: {},
       dialogConfig: {
         title: this.$t('page.setting'),
         type: 'modal',
         maskClose: false,
         isShow: true,
-        width: 'small'
+        width: 'medium'
       },
-      formConfig: [
-        {
-          name: 'ciId',
-          _belong: 'realci',
-          type: 'tree',
-          label: this.$t('term.cmdb.ci'),
-          value: this.ciId,
-          width: '100%',
-          validateList: ['required'],
-          url: 'api/rest/cmdb/ci/listtree',
-          params: { rootCiId: null },
-          valueName: 'id',
-          textName: 'label',
-          transfer: true,
-          showPath: true,
-          desc: '',
-          onChange: name => {
-            if (name) {
-              this.$set(_this.formData, 'ciId', name);
-            } else {
-              this.$set(_this.formData, 'ciId', null);
-            }
-          }
-        }
-      ]
+      treeConfig: {
+        name: 'rootCiName',
+        type: 'tree',
+        placeholder: '选择根模型',
+        width: '100%',
+        validateList: ['required'],
+        value: '',
+        dataList: [],
+        valueName: 'name',
+        textName: 'label',
+        transfer: true,
+        showPath: true,
+        search: true,
+        border: 'border'
+      },
+      attrConfig: {
+        url: '/api/rest/resourcecenter/assetlist/theadlist',
+        rootName: 'tbodyList',
+        textName: 'text',
+        valueName: 'value',
+        multiple: true,
+        transfer: true,
+        border: 'border',
+        validateList: ['required'],
+        placeholder: '选择表头字段'
+      }
     };
   },
   beforCreate() {
   },
-  async created() {
-    await this.getResourceEntity();
-  },
+  created() {},
   beforeMount() {},
-  mounted() {
-
+  async mounted() {
+    await this.getResourcetypeTree();
+    if (!this.$utils.isEmpty(this.tbodyList)) {
+      this.getResourceEntity();
+    } else {
+      this.isReady = true;
+    }
   },
   beforedUpdate() {},
   updated() {},
@@ -88,37 +107,49 @@ export default {
   beforeDestroy() {},
   destroyed() {},
   methods: {
-    async getResourceEntity() {
-      await this.$api.cmdb.resourceentity.getResourceEntity('scence_ipobject_detail').then(res => {
+    getResourcetypeTree() {
+      return this.$api.cmdb.resourceentity.getResourcetypeTree().then(res => {
+        if (res.Status == 'OK') {
+          this.tbodyList = res.Return.tbodyList || [];
+          this.treeConfig.dataList = this.tbodyList;
+        }
+      });
+    },
+    getResourceEntity() {
+      this.$api.cmdb.resourceentity.getAssetlist().then(res => {
         if (res.Status == 'OK') {
-          this.topCi = res.Return?.ci;
-          if (this.topCi) {
-            if (this.topCi.id) {
-              this.$set(this.formConfig[0].params, 'rootCiId', this.topCi.id);
-              if (this.ciId == null) {
-                this.$set(this.formConfig[0], 'value', this.topCi.id);
-                this.$set(this.formData, 'ciId', this.topCi.id);
-              }
-            }
-            this.$set(this.formConfig[0], 'desc', this.$t('term.cmdb.resourcetypetreesettingdesc'));
-            // this.$set(this.formConfig[0], 'desc', this.$t('term.cmdb.resourcetypetreesettingdesc', { label: this.topCi.label, name: this.topCi.name }));
-          }
+          this.id = res.Return.id;
+          this.$set(this.formData, 'rootCiName', res.Return.rootCiName || '');
+          this.$set(this.formData, 'fieldList', res.Return.config && res.Return.config.fieldList || []);
         }
+      }).finally(() => {
+        this.$nextTick(() => {
+          this.isReady = true;
+        });
       });
     },
     close(action) {
       this.$emit('close', action);
     },
     save() {
-      const form = this.$refs['form'];
-      if (!form.valid()) {
-        return false;
-      }
-      if (this.ciId == this.formData.ciId) {
-        this.close();
+      const formItems = this.$refs;
+      let isValid = true;
+      Object.keys(formItems).forEach(key => {
+        if (formItems[key].valid && !formItems[key].valid()) {
+          isValid = false;
+        }
+      });
+      if (!isValid) {
         return false;
       }
-      this.$api.cmdb.asset.saveResourceType(this.formData).then(res => {
+      let data = {
+        id: this.id,
+        rootCiName: this.formData.rootCiName,
+        config: {
+          fieldList: this.formData.fieldList
+        }
+      };
+      this.$api.cmdb.resourceentity.saveAssetlistData(data).then(res => {
         if (res.Status == 'OK') {
           this.$Message.success(this.$t('message.savesuccess'));
           this.close('refresh');
-- 
Gitee


From 490fe0182800fbef7269e9213ff3cf5a142ef60b Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Fri, 21 Feb 2025 17:34:06 +0800
Subject: [PATCH 08/20] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20#[1349157963399168?=
 =?UTF-8?q?]CMDB=E5=BA=94=E7=94=A8=E6=B8=85=E5=8D=95=E6=94=B9=E6=88=90?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=B1=82=E7=BA=A7=E5=8F=AF=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=20http://192.168.0.96:8090/demo/rdm.html#/story-detail/9390509?=
 =?UTF-8?q?47543040/939050947543042/1349157963399168?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/cmdb/newapplication/ci-attr-setting-dialog.vue.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/pages/cmdb/newapplication/ci-attr-setting-dialog.vue.vue b/src/views/pages/cmdb/newapplication/ci-attr-setting-dialog.vue.vue
index bf96211c3..df9ce5438 100644
--- a/src/views/pages/cmdb/newapplication/ci-attr-setting-dialog.vue.vue
+++ b/src/views/pages/cmdb/newapplication/ci-attr-setting-dialog.vue.vue
@@ -57,9 +57,11 @@ export default {
         width: 'medium'
       },
       treeConfig: {
-        url: '/api/rest/resourcecenter/resourcetype/tree',
+        url: '/api/rest/resourcecenter/resourcetype/listtree',
+        rootName: 'tbodyList',
         valueName: 'name',
         textName: 'label',
+        placeholder: '选择模型',
         transfer: true,
         showPath: true,
         search: true,
@@ -71,6 +73,7 @@ export default {
         rootName: 'tbodyList',
         textName: 'text',
         valueName: 'value',
+        placeholder: '选择表头字段',
         multiple: true,
         transfer: true,
         border: 'border',
-- 
Gitee


From f87b1829e92812a3e55d0c22e0fa9fc0df7de1d2 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Fri, 21 Feb 2025 17:46:39 +0800
Subject: [PATCH 09/20] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E8=B5=84=E4=BA=A7?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=20=20-[=E5=85=B3=E8=81=94]=20#[1349157963399?=
 =?UTF-8?q?168]CMDB=E5=BA=94=E7=94=A8=E6=B8=85=E5=8D=95=E6=94=B9=E6=88=90?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=B1=82=E7=BA=A7=E5=8F=AF=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=20http://192.168.0.96:8090/demo/rdm.html#/story-detail/9390509?=
 =?UTF-8?q?47543040/939050947543042/1349157963399168?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/cmdb/asset/asset-manage.vue         | 1 -
 src/views/pages/cmdb/asset/components/tree-edit.vue | 7 +++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/pages/cmdb/asset/asset-manage.vue b/src/views/pages/cmdb/asset/asset-manage.vue
index 0c4b467a9..a94c06145 100644
--- a/src/views/pages/cmdb/asset/asset-manage.vue
+++ b/src/views/pages/cmdb/asset/asset-manage.vue
@@ -106,7 +106,6 @@
           v-if="!loadingShow"
           v-model="selectList"
           v-bind="tableConfig"
-          :theadList="theadList"
           :multiple="true"
           :selectedRemain="selectedRemain"
           :loading="loading"
diff --git a/src/views/pages/cmdb/asset/components/tree-edit.vue b/src/views/pages/cmdb/asset/components/tree-edit.vue
index e0cdfac50..bcfe70dcc 100644
--- a/src/views/pages/cmdb/asset/components/tree-edit.vue
+++ b/src/views/pages/cmdb/asset/components/tree-edit.vue
@@ -1,5 +1,5 @@
 <template>
-  <TsDialog v-bind="dialogConfig" @on-close="close">
+  <TsDialog v-bind="dialogConfig" :loading="isSaveLoading" @on-close="close">
     <template v-slot>
       <div v-if="isReady">
         <div v-if="$utils.isEmpty(tbodyList)">
@@ -48,9 +48,9 @@ export default {
     }
   },
   data() {
-    const _this = this;
     return {
       isReady: false,
+      isSaveLoading: false,
       id: null,
       formData: {},
       dialogConfig: {
@@ -142,6 +142,7 @@ export default {
       if (!isValid) {
         return false;
       }
+      this.isSaveLoading = true;
       let data = {
         id: this.id,
         rootCiName: this.formData.rootCiName,
@@ -154,6 +155,8 @@ export default {
           this.$Message.success(this.$t('message.savesuccess'));
           this.close('refresh');
         }
+      }).finally(() => {
+        this.isSaveLoading = false;
       });
     },
     gotoResourceentityManagePage() {
-- 
Gitee


From dd03e04213100f937a45abafb00bc1284f457f4c Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Wed, 12 Mar 2025 15:38:30 +0800
Subject: [PATCH 10/20] =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]=20#[134915796339?=
 =?UTF-8?q?9168]CMDB=E5=BA=94=E7=94=A8=E6=B8=85=E5=8D=95=E6=94=B9=E6=88=90?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=B1=82=E7=BA=A7=E5=8F=AF=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=20http://192.168.0.96:8090/demo/rdm.html#/story-detail/9390509?=
 =?UTF-8?q?47543040/939050947543042/1349157963399168?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ci-attr-setting-dialog.vue.vue            | 30 ++++---
 .../cmdb/resourceentity/mapping-setting.vue   | 12 +--
 .../resourceentity/resourceentity-edit.vue    | 79 ++++++++++++++++++-
 .../resourceentity/resourceentity-manage.vue  | 10 +++
 4 files changed, 110 insertions(+), 21 deletions(-)

diff --git a/src/views/pages/cmdb/newapplication/ci-attr-setting-dialog.vue.vue b/src/views/pages/cmdb/newapplication/ci-attr-setting-dialog.vue.vue
index df9ce5438..608e30a4f 100644
--- a/src/views/pages/cmdb/newapplication/ci-attr-setting-dialog.vue.vue
+++ b/src/views/pages/cmdb/newapplication/ci-attr-setting-dialog.vue.vue
@@ -13,11 +13,12 @@
       <div v-for="(item,index) in tableSettingList" :key="index" class="pb-xs">
         <TsRow :gutter="8">
           <Col span="10">
-            <TsFormTree
+            <TsFormSelect
               ref="formItem"
-              v-model="item.ciName"
-              v-bind="treeConfig"
-            ></TsFormTree>
+              v-model="item.viewName"
+              v-bind="viewConfig"
+              :dealDataByUrl="(nodeList)=>dealDataByViewList(nodeList, item.viewName)"
+            ></TsFormSelect>
           </Col>
           <Col span="12">
             <TsFormSelect
@@ -40,7 +41,6 @@
 export default {
   name: '',
   components: {
-    TsFormTree: () => import('@/resources/plugins/TsForm/TsFormTree'),
     TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect')
   },
   filters: {},
@@ -56,11 +56,9 @@ export default {
         title: '设置',
         width: 'medium'
       },
-      treeConfig: {
-        url: '/api/rest/resourcecenter/resourcetype/listtree',
+      viewConfig: {
+        dynamicUrl: '/api/rest/resourcecenter/application/assetlist/view/list',
         rootName: 'tbodyList',
-        valueName: 'name',
-        textName: 'label',
         placeholder: '选择模型',
         transfer: true,
         showPath: true,
@@ -106,9 +104,9 @@ export default {
     },
     addData(index) {
       if (index) {
-        this.tableSettingList.splice(index, 0, { ciName: '', fieldList: [] });
+        this.tableSettingList.splice(index, 0, { viewName: '', fieldList: [] });
       } else {
-        this.tableSettingList.push({ ciName: '', fieldList: [] });
+        this.tableSettingList.push({ viewName: '', fieldList: [] });
       }
     },
     deleteItem(index) {
@@ -145,6 +143,16 @@ export default {
       }).finally(() => {
         this.isSaveLoading = false;
       });
+    },
+    dealDataByViewList(nodeList, viewName) {
+      nodeList.forEach(item => {
+        if (item.value !== viewName && this.tableSettingList.find(i => i.viewName == item.value)) {
+          this.$set(item, '_disabled', true);
+        } else {
+          this.$set(item, '_disabled', false);
+        }
+      });
+      return nodeList;
     }
   },
   computed: {},
diff --git a/src/views/pages/cmdb/resourceentity/mapping-setting.vue b/src/views/pages/cmdb/resourceentity/mapping-setting.vue
index 40c91a846..9ef78a7cb 100644
--- a/src/views/pages/cmdb/resourceentity/mapping-setting.vue
+++ b/src/views/pages/cmdb/resourceentity/mapping-setting.vue
@@ -45,7 +45,7 @@ export default {
     TsFormTree: () => import('@/resources/plugins/TsForm/TsFormTree')
   },
   props: {
-    data: Object,
+    resourceEntityData: Object,
     mainCi: {
       type: String,
       default: ''
@@ -104,11 +104,11 @@ export default {
   methods: {
     init() {
       this.list = [];
-      if (this.data) {
-        this.fieldList = this.data.fieldList || [];
-        if (this.data.config && !this.$utils.isEmpty(this.data.config.fieldMappingList)) {
+      if (this.resourceEntityData) {
+        this.fieldList = this.resourceEntityData.fieldList || [];
+        if (this.resourceEntityData.config && !this.$utils.isEmpty(this.resourceEntityData.config.fieldMappingList)) {
           this.fieldList.forEach(item => {
-            let findItem = this.data.config.fieldMappingList.find(f => f.field === item.value);
+            let findItem = this.resourceEntityData.config.fieldMappingList.find(f => f.field === item.value);
             if (findItem) {
               this.list.push(findItem);
             } else {
@@ -184,7 +184,7 @@ export default {
       return (name) => {
         let text = '';
         if (this.fieldList) {
-          let findItem = this.data.fieldList.find(item => item.value === name);
+          let findItem = this.resourceEntityData.fieldList.find(item => item.value === name);
           if (findItem) {
             text = findItem.text;
           }
diff --git a/src/views/pages/cmdb/resourceentity/resourceentity-edit.vue b/src/views/pages/cmdb/resourceentity/resourceentity-edit.vue
index e22e56833..c0c14c9f6 100644
--- a/src/views/pages/cmdb/resourceentity/resourceentity-edit.vue
+++ b/src/views/pages/cmdb/resourceentity/resourceentity-edit.vue
@@ -4,6 +4,7 @@
     @on-close="close()"
   >
     <template v-slot>
+      <Loading :loadingShow="loadingShow" type="fix"></Loading>
       <TsForm
         v-model="resourceEntityData"
         :item-list="formConfig"
@@ -15,13 +16,23 @@
             codeMode="xml"
           ></TsCodemirror>
         </template> -->
+        <template v-slot:sceneTemplateName>
+          <TsFormSelect
+            v-if="resourceEntityData.config"
+            v-model="resourceEntityData.config.sceneTemplateName"
+            v-bind="sceneTemplateNameConfig"
+            :readonly="!!name"
+            @on-change="(val, item, selectItem) => { 
+              changeSceneTemplateName(selectItem);
+            }"
+          ></TsFormSelect>
+        </template>
         <template v-slot:mainCi>
-          <template v-if="resourceEntityData.config">
+          <template v-if="isReady">
             <CiSetting ref="ciSetting" :children="ciList" @updateCiList="updateCiList"></CiSetting>
             <MappingSetting
-              v-if="!$utils.isEmpty(resourceEntityData)"
               ref="mappingSetting"
-              :data="resourceEntityData"
+              :resourceEntityData="resourceEntityData"
               :mainCi="resourceEntityData.config.mainCi"
               :ciList="ciList"
               class="pt-nm"
@@ -42,12 +53,15 @@ export default {
   components: {
     TsForm: () => import('@/resources/plugins/TsForm/TsForm'),
     // TsCodemirror:()=>import('@/resources/plugins/TsCodemirror/TsCodemirror.vue'),
+    TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect'),
     MappingSetting: () => import('./mapping-setting.vue'),
     CiSetting: () => import('./ci/ci-setting.vue')
   },
   props: {name: {type: String}},
   data() {
     return {
+      loadingShow: true,
+      isReady: false,
       resourceEntityData: {},
       dialogConfig: {
         title: this.$t('term.cmdb.viewsetting'),
@@ -60,7 +74,8 @@ export default {
           name: 'name',
           label: this.$t('term.cmdb.view'),
           type: 'text',
-          readonly: true
+          readonly: true,
+          validateList: ['required', 'unique_ident', { name: 'searchUrl', url: '/api/rest/resourcecenter/resourceentity/save', key: 'name' }]
         },
         {
           name: 'label',
@@ -79,6 +94,12 @@ export default {
         //   label: this.$t('page.config'),
         //   type: 'slot'
         // },
+        {
+          name: 'sceneTemplateName',
+          label: this.$t('page.template'),
+          type: 'slot',
+          validateList: ['required']
+        },
         {
           name: 'mainCi',
           label: this.$t('term.cmdb.mainci'),
@@ -94,6 +115,14 @@ export default {
         showPath: true,
         validateList: ['required']
       },
+      sceneTemplateNameConfig: {
+        dynamicUrl: '/api/rest/resourcecenter/suportmultipleview/scenetemplate',
+        rootName: 'tbodyList',
+        textName: 'label',
+        valueName: 'name',
+        validateList: ['required'],
+        transfer: true
+      },
       ciList: []
     };
   },
@@ -133,7 +162,42 @@ export default {
               this.ciList = [];
             }
           }
+          if (!this.resourceEntityData.isMultiple) {
+            let findItem = this.formConfig.find(item => item.name === 'sceneTemplateName');
+            if (findItem) {
+              this.$set(findItem, 'isHidden', true);
+            }
+          }
+        }).finally(() => {
+          this.isReady = true;
+          this.loadingShow = false;
+        });
+      } else {
+        //新增
+        this.formConfig.forEach(item => {
+          if (item.hasOwnProperty('readonly')) {
+            this.$set(item, 'readonly', false);
+          } 
         });
+        this.resourceEntityData = {
+          name: '',
+          label: '',
+          description: '',
+          fieldList: [],
+          config: {
+            sceneTemplateName: '',
+            mainCi: '',
+            fieldMappingList: []
+          }
+        };
+        this.ciList = [{
+          uuid: this.$utils.setUuid(),
+          ciName: '',
+          ciLabel: '',
+          children: []
+        }];
+        this.isReady = true;
+        this.loadingShow = false;
       }
     },
     save() {
@@ -167,6 +231,13 @@ export default {
     updateCiList(list) {
       this.$set(this.resourceEntityData.config, 'mainCi', list[0].ciName);
       this.ciList = this.$utils.deepClone(list);
+    },
+    changeSceneTemplateName(selectItem) {
+      this.isReady = false;
+      this.$set(this.resourceEntityData, 'fieldList', selectItem && selectItem.fieldList || []);
+      this.$nextTick(() => {
+        this.isReady = true; 
+      });
     }
   },
   filter: {},
diff --git a/src/views/pages/cmdb/resourceentity/resourceentity-manage.vue b/src/views/pages/cmdb/resourceentity/resourceentity-manage.vue
index c0233670b..12220c2e9 100644
--- a/src/views/pages/cmdb/resourceentity/resourceentity-manage.vue
+++ b/src/views/pages/cmdb/resourceentity/resourceentity-manage.vue
@@ -1,7 +1,9 @@
 <template>
   <div>
+    <Loading :loadingShow="loadingShow" type="fix"></Loading>
     <TsContain>
       <template v-slot:topLeft>
+        <span class="tsfont-plus text-href" @click="addData()">{{ $t('term.cmdb.view') }}</span>
       </template>
       <template v-slot:topRight>
         <InputSearcher v-model="keyword"></InputSearcher>
@@ -59,6 +61,7 @@ export default {
   props: {},
   data() {
     return {
+      loadingShow: true,
       keyword: '',
       currentEntityId: null,
       isEditShow: false,
@@ -110,8 +113,11 @@ export default {
       this.isEditShow = true;
     },
     getResourceEntityList() {
+      this.loadingShow = true;
       this.$api.cmdb.resourceentity.searchResourceEntity().then(res => {
         this.tbodyList = res.Return;
+      }).finally(() => {
+        this.loadingShow = false;
       });
     },
     viewData(currentPage, pageSize, name) {
@@ -141,6 +147,10 @@ export default {
       if (needRefresh) {
         this.getResourceEntityList();
       }
+    },
+    addData() {
+      this.currentEntityName = '';
+      this.isEditShow = true; 
     }
   },
   filter: {},
-- 
Gitee


From 878f604e9932e78a1d2e2e1e6982f7bf31d60cca Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Wed, 12 Mar 2025 15:41:55 +0800
Subject: [PATCH 11/20] =?UTF-8?q?[=E5=85=B3=E8=81=94]=20#[1349157963399168?=
 =?UTF-8?q?]CMDB=E5=BA=94=E7=94=A8=E6=B8=85=E5=8D=95=E6=94=B9=E6=88=90?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=B1=82=E7=BA=A7=E5=8F=AF=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=20http://192.168.0.96:8090/demo/rdm.html#/story-detail/9390509?=
 =?UTF-8?q?47543040/939050947543042/1349157963399168?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/cmdb/resourceentity/resourceentity-manage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/pages/cmdb/resourceentity/resourceentity-manage.vue b/src/views/pages/cmdb/resourceentity/resourceentity-manage.vue
index 12220c2e9..7442b747c 100644
--- a/src/views/pages/cmdb/resourceentity/resourceentity-manage.vue
+++ b/src/views/pages/cmdb/resourceentity/resourceentity-manage.vue
@@ -3,7 +3,7 @@
     <Loading :loadingShow="loadingShow" type="fix"></Loading>
     <TsContain>
       <template v-slot:topLeft>
-        <span class="tsfont-plus text-href" @click="addData()">{{ $t('term.cmdb.view') }}</span>
+        <span class="text-action tsfont-plus" @click="addData()">{{ $t('term.cmdb.view') }}</span>
       </template>
       <template v-slot:topRight>
         <InputSearcher v-model="keyword"></InputSearcher>
-- 
Gitee


From aa901bc7a26857cc044773795d82992872017d5e Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Tue, 18 Mar 2025 14:26:42 +0800
Subject: [PATCH 12/20] =?UTF-8?q?[=E5=85=B3=E8=81=94]=20#[1349157963399168?=
 =?UTF-8?q?]CMDB=E5=BA=94=E7=94=A8=E6=B8=85=E5=8D=95=E6=94=B9=E6=88=90?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=B1=82=E7=BA=A7=E5=8F=AF=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=20http://192.168.0.96:8090/demo/rdm.html#/story-detail/9390509?=
 =?UTF-8?q?47543040/939050947543042/1349157963399168?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../applicationManage/applicationManage.js    |   3 +
 .../resource/resourceentity/resourceentity.js |   3 +
 src/views/pages/cmdb/asset/asset-manage.vue   |   1 +
 .../pages/cmdb/asset/components/tree-edit.vue |  41 +----
 .../cmdb/newapplication/assets-manage.vue     | 149 +++++++++++++---
 .../ci-attr-setting-dialog.vue.vue            | 164 +++++++++++++-----
 .../resourceentity/resourceentity-edit.vue    |  15 +-
 .../resourceentity/resourceentity-manage.vue  |  34 +++-
 8 files changed, 307 insertions(+), 103 deletions(-)

diff --git a/src/resources/api/cmdb/resource/applicationManage/applicationManage.js b/src/resources/api/cmdb/resource/applicationManage/applicationManage.js
index a51c18375..b8a9f4996 100644
--- a/src/resources/api/cmdb/resource/applicationManage/applicationManage.js
+++ b/src/resources/api/cmdb/resource/applicationManage/applicationManage.js
@@ -48,6 +48,9 @@ const applicationManage = {
   },
   getAppResourceList(params) { 
     return axios.post('/api/rest/resourcecenter/app/resource/list', params);
+  },
+  getAppAssetTheadlist() {
+    return axios.post('/api/rest/resourcecenter/app/assetlist/theadlist', {});
   }
 };
 export default applicationManage;
diff --git a/src/resources/api/cmdb/resource/resourceentity/resourceentity.js b/src/resources/api/cmdb/resource/resourceentity/resourceentity.js
index 02f17f3f4..cd4416dd2 100644
--- a/src/resources/api/cmdb/resource/resourceentity/resourceentity.js
+++ b/src/resources/api/cmdb/resource/resourceentity/resourceentity.js
@@ -23,6 +23,9 @@ const resourceentity = {
   },
   saveAssetlistData(params) {
     return axios.post('/api/rest/resourcecenter/assetlist/display/save', params);
+  },
+  deleteResourceentityData(params) {
+    return axios.post('/api/rest/resourcecenter/resourceentity/delete', params);
   }
 };
 export default resourceentity;
diff --git a/src/views/pages/cmdb/asset/asset-manage.vue b/src/views/pages/cmdb/asset/asset-manage.vue
index a94c06145..0c4b467a9 100644
--- a/src/views/pages/cmdb/asset/asset-manage.vue
+++ b/src/views/pages/cmdb/asset/asset-manage.vue
@@ -106,6 +106,7 @@
           v-if="!loadingShow"
           v-model="selectList"
           v-bind="tableConfig"
+          :theadList="theadList"
           :multiple="true"
           :selectedRemain="selectedRemain"
           :loading="loading"
diff --git a/src/views/pages/cmdb/asset/components/tree-edit.vue b/src/views/pages/cmdb/asset/components/tree-edit.vue
index bcfe70dcc..cb25c3c7f 100644
--- a/src/views/pages/cmdb/asset/components/tree-edit.vue
+++ b/src/views/pages/cmdb/asset/components/tree-edit.vue
@@ -8,23 +8,11 @@
           <a class="text-href" href="javascript:void(0);" @click.stop="gotoResourceentityManagePage()">{{ $t('term.cmdb.gotoresourceentitymanagepage') }}</a>
         </div>
         <TsFormItem :label="$t('term.cmdb.ci')" required>
-          <TsRow :gutter="8">
-            <Col span="8">
-              <TsFormTree
-                ref="formTree"
-                v-model="formData.rootCiName"
-                v-bind="treeConfig"
-              ></TsFormTree>
-            </Col>
-            <Col span="14">
-              <TsFormSelect
-                ref="formItem"
-                v-model="formData.fieldList"
-                v-bind="attrConfig"
-                class="mr-sm"
-              ></TsFormSelect>
-            </Col>
-          </TsRow>
+          <TsFormTree
+            ref="formTree"
+            v-model="formData.rootCiName"
+            v-bind="treeConfig"
+          ></TsFormTree>
         </TsFormItem>
       </div>
     </template>
@@ -38,7 +26,6 @@
 export default {
   name: '',
   components: {
-    TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect'),
     TsFormTree: () => import('@/resources/plugins/TsForm/TsFormTree'),
     TsFormItem: () => import('@/resources/plugins/TsForm/TsFormItem')
   },
@@ -74,17 +61,6 @@ export default {
         showPath: true,
         search: true,
         border: 'border'
-      },
-      attrConfig: {
-        url: '/api/rest/resourcecenter/assetlist/theadlist',
-        rootName: 'tbodyList',
-        textName: 'text',
-        valueName: 'value',
-        multiple: true,
-        transfer: true,
-        border: 'border',
-        validateList: ['required'],
-        placeholder: '选择表头字段'
       }
     };
   },
@@ -117,10 +93,9 @@ export default {
     },
     getResourceEntity() {
       this.$api.cmdb.resourceentity.getAssetlist().then(res => {
-        if (res.Status == 'OK') {
+        if (res.Status == 'OK' && res.Return) {
           this.id = res.Return.id;
           this.$set(this.formData, 'rootCiName', res.Return.rootCiName || '');
-          this.$set(this.formData, 'fieldList', res.Return.config && res.Return.config.fieldList || []);
         }
       }).finally(() => {
         this.$nextTick(() => {
@@ -146,9 +121,7 @@ export default {
       let data = {
         id: this.id,
         rootCiName: this.formData.rootCiName,
-        config: {
-          fieldList: this.formData.fieldList
-        }
+        config: {}
       };
       this.$api.cmdb.resourceentity.saveAssetlistData(data).then(res => {
         if (res.Status == 'OK') {
diff --git a/src/views/pages/cmdb/newapplication/assets-manage.vue b/src/views/pages/cmdb/newapplication/assets-manage.vue
index 6faf06987..2668ba6cc 100644
--- a/src/views/pages/cmdb/newapplication/assets-manage.vue
+++ b/src/views/pages/cmdb/newapplication/assets-manage.vue
@@ -24,7 +24,7 @@
     </div>
     <div v-if="tableList && tableList.length > 0 ">
       <div v-for="(item, index) in tableList" :key="index">
-        <div class="h3 padding-sm">{{ item.type.label }}</div>
+        <div class="h3 padding-sm">{{ item.viewLabel }}</div>
         <TsTable
           :fixedHeader="false"
           :theadList="item.theadList"
@@ -33,43 +33,129 @@
           @changePageSize="(pageSize) => changePageSize(pageSize,item, index)"
         >
           <template v-slot:ip="{ row }">
-            <span class="text-href" @click="toCientityView(row)">
-              <span>{{ row.ip }}</span>
-              <span v-if="row.port">:{{ row.port }}</span>
+            <span v-if="!$utils.isEmpty(row.ip)" class="text-href" @click="toCientityView(row.ip)">
+              <span>{{ row.ip.ip }}</span>
+              <span v-if="row.ip.port">:{{ row.ip.port }}</span>
             </span>
+            <span v-else></span>
           </template>
-          <template v-slot:monitorStatus="{ row }">
+          <template v-slot:allIpList="{ row }">
+            <div v-if="!$utils.isEmpty(row.allIpList)">
+              <Tag
+                v-for="(v, vindex) in row.allIpList"
+                :key="vindex"
+                class="cursor-pointer"
+                @click.native="toCientityView(v)"
+              >
+                {{ v.name }}
+              </Tag>
+            </div>
+            <div v-else></div>
+          </template>
+          <template v-slot:lcu="{row}">
+            <UserCard v-bind="row.lcu" :hideAvatar="true"></UserCard>
+          </template>
+          <template v-slot:fcu="{ row }">
+            <UserCard v-bind="row.fcu" :hideAvatar="true"></UserCard>
+          </template>
+          <template v-slot:vendor="{ row }">
+            <Tag
+              v-if="!$utils.isEmpty(row.vendor)"
+              class="cursor-pointer"
+              @click.native="toCientityView(row.vendor)"
+            >
+              {{ row.vendor.name }}
+            </Tag>
+            <span v-else></span>
+          </template>
+          <template v-slot:monitor="{ row }">
             <!-- 监控状态 -->
-            <span v-if="row.monitorStatusJson && row.monitorTime" :title="row.monitorTime | formatDate">
-              <span :class="[row.monitorStatusJson.cssClass, {'background-FATAL': row.monitorStatusJson.value== 'FATAL'}]" class="vertical cursor">{{ row.monitorStatusJson.text }} </span>
+            <span v-if="row.monitor && row.monitor.time" :title="row.monitor.time | formatDate">
+              <span :class="[row.monitor.cssClass, {'background-FATAL': row.monitor.value== 'FATAL'}]" class="vertical">{{ row.monitor.text }} </span>
               <span class="text-title">
-                {{ handleTimes(row.monitorTime) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
+                {{ handleTimes(row.monitor.time) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
               </span>
             </span>
-            <span v-else>
-              <span>-</span>
-            </span>
+            <span v-else></span>
           </template>
-          <template v-slot:inspectStatus="{ row }">
+          <template v-slot:inspect="{ row }">
             <!-- 巡检状态 -->
-            <span v-if="row.inspectStatusJson && row.inspectTime" :title="row.inspectTime | formatDate">
-              <span :class="[row.inspectStatusJson.cssClass, {'background-FATAL': row.inspectStatusJson.value== 'FATAL'}]" class="vertical cursor" @click="toInspectStatusDetail(row)">{{ row.inspectStatusJson.text }} </span>
+            <span v-if="row.inspect && row.inspect.time" :title="row.inspect.time | formatDate">
+              <span :class="[row.inspect.cssClass, {'background-FATAL': row.inspect.value== 'FATAL'}]" class="vertical cursor" @click="toInspectStatusDetail(row)">{{ row.inspect.text }} </span>
               <span class="text-title">
-                {{ handleTimes(row.inspectTime) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
+                {{ handleTimes(row.inspect.time) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
               </span>
             </span>
             <span v-else>-</span>
           </template>
-          <template v-slot:bgList="{ row }">
-            <GroupList :dataList="row.bgList" type="tag" textName="bgName"></GroupList>
+          <template v-slot:appModule="{ row }">
+            <div v-if="!$utils.isEmpty(row.appModule)" class="text-href" @click="toCientityView(row.appModule)">
+              <span class="tsfont-ci-o"></span>
+              <span>{{ row.appModule.name }}</span>
+            </div>
+          </template>
+          <template v-slot:appEnvironment="{ row }">
+            <div v-if="!$utils.isEmpty(row.appEnvironment)" class="text-href" @click="toGlobalAttrManage()">
+              {{ row.appEnvironment.value }}
+            </div>
+          </template>
+          <template v-slot:appSystem="{row}">
+            <!-- 应用系统 -->
+            <div v-if="!$utils.isEmpty(row.appSystem)" class="text-href" @click="toCientityView(row.appSystem)">
+              <span :class="row.appSystem.ciIcon"></span>
+              <span>{{ row.appSystem.name }}</span>
+            </div>
+          </template>
+          <template v-slot:businessGroupList="{ row }">
+            <div v-if="!$utils.isEmpty(row.businessGroupList)">
+              <Tag v-for="(b, bindex) in row.businessGroupList" :key="bindex">
+                {{ b.name }}
+              </Tag>
+            </div>
+            <div v-else></div>
+          </template>
+          <template v-slot:state="{row}">
+            <!-- 资产状态 -->
+            <div v-if="!$utils.isEmpty(row.state)" class="text-href" @click="toCientityView(row.state)">
+              {{ row.state.name }}
+            </div>
           </template>
           <template v-slot:ownerList="{ row }">
-            <GroupList :dataList="row.ownerList" type="tag" textName="userName"></GroupList>
+            <div v-if="!$utils.isEmpty(row.ownerList)">
+              <Tag v-for="(o, oindex) in row.ownerList" :key="oindex">
+                {{ o.name }}
+              </Tag>
+            </div>
+            <div v-else></div>
           </template>
-          <template v-slot:clusterName="{row}">
-            <!-- 所在集群 -->
-            <span v-if="row" class="text-href" @click="gotoCluster(row)">{{ row.clusterName }}</span>
+          <template v-slot:ci="{row}">
+            <!-- 模型 -->
+            <div v-if="!$utils.isEmpty(row.ci)" class="text-href" @click="toCiView(row.ci)">
+              <span class="tsfont-ci-o"></span>
+              <span>{{ row.ci.name }}</span>
+            </div>
+          </template>
+          <template v-slot:dataCenter="{ row }">
+            <!-- 数据中心 -->
+            <Tag
+              v-if="!$utils.isEmpty(row.dataCenter)"
+              class="cursor-pointer"
+              @click.native="toCientityView(row.dataCenter)"
+            >
+              {{ row.dataCenter.name }}
+            </Tag>
+            <span v-else></span>
+          </template>
+          <template v-slot:fcd="{ row }">
+            <div v-if="row.fcd">{{ row.fcd | formatDate }}</div>
           </template>
+          <template v-slot:lcd="{ row }">
+            <div v-if="row.lcd">{{ row.lcd | formatDate }}</div>
+          </template>
+          <!-- <template v-slot:clusterName="{row}">
+            所在集群 
+            <span v-if="row" class="text-href" @click="gotoCluster(row)">{{ row.clusterName }}</span>
+          </template> -->
         </TsTable>
       </div>
     </div>
@@ -80,8 +166,8 @@
 export default {
   name: '',
   components: {
-    GroupList: () => import('@/resources/components/GroupList/GroupList.vue'),
-    TsTable: () => import('@/resources/components/TsTable/TsTable.vue')
+    TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
+    UserCard: () => import('@/resources/components/UserCard/UserCard.vue')
   },
   filters: {},
   props: {
@@ -187,7 +273,7 @@ export default {
         appSystemId: this.appSystemId,
         appModuleId: this.appModuleId,
         envId: this.envId,
-        typeId: row && row.type ? row.type.id : null,
+        viewName: row && row.viewName ? row.viewName : null,
         currentPage: this.tableData.currentPage,
         pageSize: this.tableData.pageSize
       };
@@ -221,7 +307,12 @@ export default {
     toCientityView(row) {
       // 应用清单详情
       if (row && !this.$utils.isEmptyObj(row)) {
-        this.$router.push({ path: './ci/' + row.typeId + '/cientity-view/' + row.id });
+        this.$router.push({ path: './ci/' + row.ciId + '/cientity-view/' + row.id });
+      }
+    },
+    toCiView(ci) {
+      if (ci && !this.$utils.isEmptyObj(ci)) {
+        this.$router.push({ path: '/ci-view/' + ci.id });
       }
     },
     toInspectStatusDetail(row) {
@@ -232,10 +323,16 @@ export default {
           this.$router.push({ path: './assets-detail-' + row.id});
         } else {
           // cmdb模块
-          this.$router.push({ path: './inspect-status-detail-' + row.id});
+          if (this.$AuthUtils.hasRole('INSPECT_BASE')) {
+            this.$router.push({ path: './inspect-status-detail-' + row.id});
+          }
         }
       }
     },
+    toGlobalAttrManage() {
+      //全局属性管理
+      window.open(HOME + '/cmdb.html#/global-attr-manage', '_blank');
+    },
     selectedEnv(name) {
       let envId = null;
       this.envList.forEach(v => {
diff --git a/src/views/pages/cmdb/newapplication/ci-attr-setting-dialog.vue.vue b/src/views/pages/cmdb/newapplication/ci-attr-setting-dialog.vue.vue
index 608e30a4f..104771ace 100644
--- a/src/views/pages/cmdb/newapplication/ci-attr-setting-dialog.vue.vue
+++ b/src/views/pages/cmdb/newapplication/ci-attr-setting-dialog.vue.vue
@@ -10,37 +10,81 @@
       <div>
         <Button class="mb-sm" @click="addData()">{{ $t('term.pbc.adddata') }}</Button>
       </div>
-      <div v-for="(item,index) in tableSettingList" :key="index" class="pb-xs">
-        <TsRow :gutter="8">
-          <Col span="10">
-            <TsFormSelect
-              ref="formItem"
-              v-model="item.viewName"
-              v-bind="viewConfig"
-              :dealDataByUrl="(nodeList)=>dealDataByViewList(nodeList, item.viewName)"
-            ></TsFormSelect>
-          </Col>
-          <Col span="12">
-            <TsFormSelect
-              ref="formItem"
-              v-model="item.fieldList"
-              v-bind="attrConfig"
-              class="mr-sm"
-            ></TsFormSelect>
-          </Col>
-          <Col span="2">
-            <span class="text-action tsfont-plus pr-xs" @click="addData(index+1)"></span>
-            <span class="text-action tsfont-minus" @click="deleteItem(index)"></span>
-          </Col>
-        </TsRow>
-      </div>
+      <draggable
+        v-if="tableSettingList && tableSettingList.length"
+        class="clearfix"
+        tag="div"
+        :list="tableSettingList"
+        handle=".move"
+      >
+        <div v-for="(item,index) in tableSettingList" :key="index" class="bg-op radius-sm mb-md">
+          <div class="flex-between border-base-bottom padding-sm">
+            <span
+              class="move tsfont-bar pr-xs"
+              :title="$t('term.deploy.dragtochangetheorder')"
+              @click.stop
+            ></span>
+            <div>
+              <span class="text-action tsfont-plus pr-xs" @click="addData(index+1)"></span>
+              <span class="text-action tsfont-minus" @click="deleteItem(index)"></span>
+            </div>
+          </div>
+          <div class="padding-sm">
+            <TsFormItem label="资产清单" labelPosition="left">
+              <TsFormSelect
+                ref="formItem"
+                v-model="item.viewName"
+                v-bind="viewConfig"
+                :dealDataByUrl="(nodeList)=>dealDataByViewList(nodeList, item.viewName)"
+                @on-change="(val)=>changeViewName(val, item)"
+              ></TsFormSelect>
+            </TsFormItem>
+            <TsFormItem label="表头属性" labelPosition="left">
+              <div>
+                <Tag
+                  v-for="(a,aindex) in assetTheadlist"
+                  :key="aindex"
+                  :checked="item.fieldList.includes(a.value)"
+                  checkable
+                  color="primary"
+                  size="medium"
+                  class="border-color tag"
+                  @on-change="selectItem(a.value, item)"
+                >{{ a.text }}</Tag>
+              </div>
+              <div v-if="$utils.isEmpty(item.fieldList)" class="text-error">{{ $t('form.placeholder.pleaseselect',{'target':$t('page.attribute')}) }}</div>
+            </TsFormItem>
+            <template v-if="item.fieldList && item.fieldList.length > 0">
+              <Divider orientation="left" style="font-size: 14px">{{ $t('term.process.attrdragtip') }}</Divider>
+              <draggable
+                class="clearfix"
+                tag="div"
+                :list="item.fieldList"
+                handle=".move"
+              >
+                <Tag
+                  v-for="value in item.fieldList"
+                  :key="value"
+                  :name="value"
+                  closable
+                  size="medium"
+                  @on-close="handleClose(value, item)"
+                ><span class="move tsfont-bar"></span> {{ getAssetTheadLabel(value) }}</Tag>
+              </draggable>
+            </template>
+          </div>
+        </div>
+      </draggable>
     </div>
   </TsDialog>
 </template>
 <script>
+import draggable from 'vuedraggable';
 export default {
   name: '',
   components: {
+    draggable,
+    TsFormItem: () => import('@/resources/plugins/TsForm/TsFormItem'),
     TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect')
   },
   filters: {},
@@ -53,7 +97,8 @@ export default {
       config: {},
       tableSettingList: [],
       setting: {
-        title: '设置',
+        title: this.$t('page.setting'),
+        type: 'slider',
         width: 'medium'
       },
       viewConfig: {
@@ -66,22 +111,13 @@ export default {
         border: 'border',
         validateList: ['required']
       },
-      attrConfig: {
-        url: '/api/rest/resourcecenter/assetlist/theadlist',
-        rootName: 'tbodyList',
-        textName: 'text',
-        valueName: 'value',
-        placeholder: '选择表头字段',
-        multiple: true,
-        transfer: true,
-        border: 'border',
-        validateList: ['required']
-      },
-      isSaveLoading: false
+      isSaveLoading: false,
+      assetTheadlist: []
     };
   },
   beforeCreate() {},
   created() {
+    this.getAppAssetTheadlist();
     this.getApplicationlistSetting();
   },
   beforeMount() {},
@@ -123,6 +159,11 @@ export default {
           isValid = false;
         }
       });
+      this.tableSettingList.forEach(item => {
+        if (this.$utils.isEmpty(item.fieldList)) {
+          isValid = false;
+        } 
+      });
       if (!isValid) {
         return;
       }
@@ -153,10 +194,55 @@ export default {
         }
       });
       return nodeList;
+    },
+    getAppAssetTheadlist() {
+      this.$api.cmdb.applicationManage.getAppAssetTheadlist().then(res => {
+        if (res.Status == 'OK' && res.Return) {
+          this.assetTheadlist = res.Return.tbodyList || [];
+        }
+      }); 
+    },
+    changeViewName(val, item) {
+      if (val) {
+        this.$set(item, 'fieldList', this.$utils.mapArray(this.assetTheadlist, 'value'));
+      } else {
+        this.$set(item, 'fieldList', []);
+      }
+    },
+    selectItem(value, item) {
+      if (item.fieldList.includes(value)) {
+        item.fieldList.splice(item.fieldList.indexOf(value), 1);
+      } else {
+        item.fieldList.push(value);
+      }
+    },
+    handleClose(value, item) {
+      item.fieldList.splice(item.fieldList.indexOf(value), 1); 
+    }
+  },
+  computed: {
+    getAssetTheadLabel() {
+      return (value) => {
+        let label = '';
+        this.assetTheadlist.forEach(item => {
+          if (item.value == value) {
+            label = item.text;
+          }
+        }); 
+        return label;
+      };
     }
   },
-  computed: {},
   watch: {}
 };
 </script>
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.tag {
+  border-width: 1px !important;
+  border-style: solid !important;
+  cursor: pointer;
+}
+.move {
+  cursor: move;
+}
+</style>
diff --git a/src/views/pages/cmdb/resourceentity/resourceentity-edit.vue b/src/views/pages/cmdb/resourceentity/resourceentity-edit.vue
index c0c14c9f6..959883ff5 100644
--- a/src/views/pages/cmdb/resourceentity/resourceentity-edit.vue
+++ b/src/views/pages/cmdb/resourceentity/resourceentity-edit.vue
@@ -21,7 +21,7 @@
             v-if="resourceEntityData.config"
             v-model="resourceEntityData.config.sceneTemplateName"
             v-bind="sceneTemplateNameConfig"
-            :readonly="!!name"
+            :readonly="!!name && !isCopy"
             @on-change="(val, item, selectItem) => { 
               changeSceneTemplateName(selectItem);
             }"
@@ -57,7 +57,10 @@ export default {
     MappingSetting: () => import('./mapping-setting.vue'),
     CiSetting: () => import('./ci/ci-setting.vue')
   },
-  props: {name: {type: String}},
+  props: {
+    name: {type: String},
+    isCopy: {type: Boolean}
+  },
   data() {
     return {
       loadingShow: true,
@@ -140,6 +143,11 @@ export default {
   methods: {
     getResourceEntityData() {
       if (this.name) {
+        this.formConfig.forEach(item => {
+          if (item.hasOwnProperty('readonly') && (['label', 'description'].includes(item.name) || this.isCopy)) {
+            this.$set(item, 'readonly', false);
+          } 
+        });
         this.$api.cmdb.resourceentity.getResourceEntity(this.name).then(res => {
           this.resourceEntityData = res.Return || {};
           if (!this.resourceEntityData.config) {
@@ -168,6 +176,9 @@ export default {
               this.$set(findItem, 'isHidden', true);
             }
           }
+          if (this.isCopy) {
+            this.$set(this.resourceEntityData, 'name', this.resourceEntityData.name + '_copy');
+          }
         }).finally(() => {
           this.isReady = true;
           this.loadingShow = false;
diff --git a/src/views/pages/cmdb/resourceentity/resourceentity-manage.vue b/src/views/pages/cmdb/resourceentity/resourceentity-manage.vue
index 7442b747c..91f7fea67 100644
--- a/src/views/pages/cmdb/resourceentity/resourceentity-manage.vue
+++ b/src/views/pages/cmdb/resourceentity/resourceentity-manage.vue
@@ -29,6 +29,8 @@
           <template v-slot:action="{ row }">
             <div class="tstable-action">
               <ul class="tstable-action-ul">
+                <li v-if="row.isMultiple" class="tsfont-copy" @click="copyEntity(row)">{{ $t('page.copy') }}</li>
+                <li v-if="row.isMultiple" class="tsfont-trash-o" @click="deleteEntity(row)">{{ $t('page.delete') }}</li>
                 <li class="tsfont-circulation-s" @click="viewData(1, 10, row.name)">{{ $t('page.viewdata') }}</li>
               </ul>
             </div>
@@ -36,7 +38,12 @@
         </TsTable>
       </template>
     </TsContain>
-    <ResourceEditDialog v-if="isEditShow" :name="currentEntityName" @close="closeEntityDialog"></ResourceEditDialog>
+    <ResourceEditDialog
+      v-if="isEditShow"
+      :name="currentEntityName"
+      :isCopy="isCopy"
+      @close="closeEntityDialog"
+    ></ResourceEditDialog>
     <TsDialog
       v-bind="dialogConfig"
       @on-close="close"
@@ -92,7 +99,8 @@ export default {
         currentPage: 1,
         pageSize: 10,
         name: ''
-      }
+      },
+      isCopy: false
     };
   },
   beforeCreate() {},
@@ -144,6 +152,7 @@ export default {
     },
     closeEntityDialog(needRefresh) {
       this.isEditShow = false;
+      this.isCopy = false;
       if (needRefresh) {
         this.getResourceEntityList();
       }
@@ -151,6 +160,27 @@ export default {
     addData() {
       this.currentEntityName = '';
       this.isEditShow = true; 
+    },
+    copyEntity(row) {
+      this.currentEntityName = row.name;
+      this.isCopy = true;
+      this.isEditShow = true;
+    },
+    deleteEntity(row) {
+      this.$createDialog({
+        title: this.$t('dialog.title.deleteconfirm'),
+        content: this.$t('dialog.content.deletetargetconfirm', {'target': row.name}),
+        btnType: 'error',
+        'on-ok': vnode => {
+          this.$api.cmdb.resourceentity.deleteResourceentityData({name: row.name}).then(res => {
+            if (res.Status == 'OK') {
+              vnode.isShow = false;
+              this.$Message.success(this.$t('message.deletesuccess'));
+              this.getResourceEntityList();
+            }
+          });
+        }
+      });
     }
   },
   filter: {},
-- 
Gitee


From a2f807b04c52f3eb7ad3fb13df8e2f0c3b45d94b Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Tue, 18 Mar 2025 15:34:22 +0800
Subject: [PATCH 13/20] =?UTF-8?q?[=E5=85=B3=E8=81=94]=20#[1349157963399168?=
 =?UTF-8?q?]CMDB=E5=BA=94=E7=94=A8=E6=B8=85=E5=8D=95=E6=94=B9=E6=88=90?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=B1=82=E7=BA=A7=E5=8F=AF=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=20http://192.168.0.96:8090/demo/rdm.html#/story-detail/9390509?=
 =?UTF-8?q?47543040/939050947543042/1349157963399168?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cmdb/newapplication/assets-manage.vue     | 24 ++++--
 .../ci-attr-setting-dialog.vue.vue            | 79 +++++++++++--------
 .../resourceentity/resourceentity-edit.vue    |  1 +
 3 files changed, 63 insertions(+), 41 deletions(-)

diff --git a/src/views/pages/cmdb/newapplication/assets-manage.vue b/src/views/pages/cmdb/newapplication/assets-manage.vue
index 2668ba6cc..56de356de 100644
--- a/src/views/pages/cmdb/newapplication/assets-manage.vue
+++ b/src/views/pages/cmdb/newapplication/assets-manage.vue
@@ -108,7 +108,12 @@
           </template>
           <template v-slot:businessGroupList="{ row }">
             <div v-if="!$utils.isEmpty(row.businessGroupList)">
-              <Tag v-for="(b, bindex) in row.businessGroupList" :key="bindex">
+              <Tag
+                v-for="(b, bindex) in row.businessGroupList"
+                :key="bindex"
+                class="cursor-pointer"
+                @click.native="toCientityView(b)"
+              >
                 {{ b.name }}
               </Tag>
             </div>
@@ -122,7 +127,12 @@
           </template>
           <template v-slot:ownerList="{ row }">
             <div v-if="!$utils.isEmpty(row.ownerList)">
-              <Tag v-for="(o, oindex) in row.ownerList" :key="oindex">
+              <Tag
+                v-for="(o, oindex) in row.ownerList"
+                :key="oindex"
+                class="cursor-pointer"
+                @click.native="toCientityView(o);"
+              >
                 {{ o.name }}
               </Tag>
             </div>
@@ -132,7 +142,7 @@
             <!-- 模型 -->
             <div v-if="!$utils.isEmpty(row.ci)" class="text-href" @click="toCiView(row.ci)">
               <span class="tsfont-ci-o"></span>
-              <span>{{ row.ci.name }}</span>
+              <span>{{ row.ci.label }}</span>
             </div>
           </template>
           <template v-slot:dataCenter="{ row }">
@@ -307,12 +317,12 @@ export default {
     toCientityView(row) {
       // 应用清单详情
       if (row && !this.$utils.isEmptyObj(row)) {
-        this.$router.push({ path: './ci/' + row.ciId + '/cientity-view/' + row.id });
+        window.open(HOME + '/cmdb.html#/ci/' + row.ciId + '/cientity-view/' + row.id, '_blank');
       }
     },
     toCiView(ci) {
       if (ci && !this.$utils.isEmptyObj(ci)) {
-        this.$router.push({ path: '/ci-view/' + ci.id });
+        window.open(HOME + '/cmdb.html#/ci-view/' + ci.id, '_blank');
       }
     },
     toInspectStatusDetail(row) {
@@ -320,11 +330,11 @@ export default {
       if (row && !this.$utils.isEmptyObj(row)) {
         if (this.moduleName == 'inspect') {
           // inspect模块
-          this.$router.push({ path: './assets-detail-' + row.id});
+          window.open(HOME + '/inspect.html#/assets-detail-' + row.id, '_blank');
         } else {
           // cmdb模块
           if (this.$AuthUtils.hasRole('INSPECT_BASE')) {
-            this.$router.push({ path: './inspect-status-detail-' + row.id});
+            window.open(HOME + '/cmdb.html#/inspect.html#/inspect-status-detail-' + row.id, '_blank');
           }
         }
       }
diff --git a/src/views/pages/cmdb/newapplication/ci-attr-setting-dialog.vue.vue b/src/views/pages/cmdb/newapplication/ci-attr-setting-dialog.vue.vue
index 104771ace..3a26ad854 100644
--- a/src/views/pages/cmdb/newapplication/ci-attr-setting-dialog.vue.vue
+++ b/src/views/pages/cmdb/newapplication/ci-attr-setting-dialog.vue.vue
@@ -26,7 +26,8 @@
             ></span>
             <div>
               <span class="text-action tsfont-plus pr-xs" @click="addData(index+1)"></span>
-              <span class="text-action tsfont-minus" @click="deleteItem(index)"></span>
+              <span class="text-action tsfont-trash-o pr-xs" @click="deleteItem(index)"></span>
+              <span class="text-action" :class="item._isShow?'tsfont-down':'tsfont-up'" @click="toggleshow(item)"></span>
             </div>
           </div>
           <div class="padding-sm">
@@ -39,39 +40,41 @@
                 @on-change="(val)=>changeViewName(val, item)"
               ></TsFormSelect>
             </TsFormItem>
-            <TsFormItem label="表头属性" labelPosition="left">
-              <div>
-                <Tag
-                  v-for="(a,aindex) in assetTheadlist"
-                  :key="aindex"
-                  :checked="item.fieldList.includes(a.value)"
-                  checkable
-                  color="primary"
-                  size="medium"
-                  class="border-color tag"
-                  @on-change="selectItem(a.value, item)"
-                >{{ a.text }}</Tag>
-              </div>
-              <div v-if="$utils.isEmpty(item.fieldList)" class="text-error">{{ $t('form.placeholder.pleaseselect',{'target':$t('page.attribute')}) }}</div>
-            </TsFormItem>
-            <template v-if="item.fieldList && item.fieldList.length > 0">
-              <Divider orientation="left" style="font-size: 14px">{{ $t('term.process.attrdragtip') }}</Divider>
-              <draggable
-                class="clearfix"
-                tag="div"
-                :list="item.fieldList"
-                handle=".move"
-              >
-                <Tag
-                  v-for="value in item.fieldList"
-                  :key="value"
-                  :name="value"
-                  closable
-                  size="medium"
-                  @on-close="handleClose(value, item)"
-                ><span class="move tsfont-bar"></span> {{ getAssetTheadLabel(value) }}</Tag>
-              </draggable>
-            </template>
+            <div v-show="item._isShow">
+              <TsFormItem label="表头属性" labelPosition="left">
+                <div>
+                  <Tag
+                    v-for="(a,aindex) in assetTheadlist"
+                    :key="aindex"
+                    :checked="item.fieldList.includes(a.value)"
+                    checkable
+                    color="primary"
+                    size="medium"
+                    class="border-color tag"
+                    @on-change="selectItem(a.value, item)"
+                  >{{ a.text }}</Tag>
+                </div>
+                <div v-if="$utils.isEmpty(item.fieldList)" class="text-error">{{ $t('form.placeholder.pleaseselect',{'target':$t('page.attribute')}) }}</div>
+              </TsFormItem>
+              <template v-if="item.fieldList && item.fieldList.length > 0">
+                <Divider orientation="left" style="font-size: 14px">{{ $t('term.process.attrdragtip') }}</Divider>
+                <draggable
+                  class="clearfix"
+                  tag="div"
+                  :list="item.fieldList"
+                  handle=".move"
+                >
+                  <Tag
+                    v-for="value in item.fieldList"
+                    :key="value"
+                    :name="value"
+                    closable
+                    size="medium"
+                    @on-close="handleClose(value, item)"
+                  ><span class="move tsfont-bar"></span> {{ getAssetTheadLabel(value) }}</Tag>
+                </draggable>
+              </template>
+            </div>
           </div>
         </div>
       </draggable>
@@ -135,6 +138,11 @@ export default {
           this.id = res.Return.id || null;
           this.config = res.Return.config || {};
           this.tableSettingList = this.config.tableSettingList || [];
+          if (this.tableSettingList.length) {
+            this.tableSettingList.forEach(item => {
+              this.$set(item, '_isShow', true);
+            }); 
+          }
         }
       });
     },
@@ -218,6 +226,9 @@ export default {
     },
     handleClose(value, item) {
       item.fieldList.splice(item.fieldList.indexOf(value), 1); 
+    },
+    toggleshow(item) {
+      this.$set(item, '_isShow', !item._isShow); 
     }
   },
   computed: {
diff --git a/src/views/pages/cmdb/resourceentity/resourceentity-edit.vue b/src/views/pages/cmdb/resourceentity/resourceentity-edit.vue
index 959883ff5..02592a0f8 100644
--- a/src/views/pages/cmdb/resourceentity/resourceentity-edit.vue
+++ b/src/views/pages/cmdb/resourceentity/resourceentity-edit.vue
@@ -246,6 +246,7 @@ export default {
     changeSceneTemplateName(selectItem) {
       this.isReady = false;
       this.$set(this.resourceEntityData, 'fieldList', selectItem && selectItem.fieldList || []);
+      this.$set(this.resourceEntityData.config, 'fieldMappingList', []);
       this.$nextTick(() => {
         this.isReady = true; 
       });
-- 
Gitee


From 9887fb96e177359801eea3cee016c7a500f107c2 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Tue, 18 Mar 2025 15:41:12 +0800
Subject: [PATCH 14/20] =?UTF-8?q?[=E5=85=B3=E8=81=94]=20#[1349157963399168?=
 =?UTF-8?q?]CMDB=E5=BA=94=E7=94=A8=E6=B8=85=E5=8D=95=E6=94=B9=E6=88=90?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=B1=82=E7=BA=A7=E5=8F=AF=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=20http://192.168.0.96:8090/demo/rdm.html#/story-detail/9390509?=
 =?UTF-8?q?47543040/939050947543042/1349157963399168?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/cmdb/newapplication/assets-manage.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/pages/cmdb/newapplication/assets-manage.vue b/src/views/pages/cmdb/newapplication/assets-manage.vue
index 56de356de..0cab63c6a 100644
--- a/src/views/pages/cmdb/newapplication/assets-manage.vue
+++ b/src/views/pages/cmdb/newapplication/assets-manage.vue
@@ -90,7 +90,7 @@
           </template>
           <template v-slot:appModule="{ row }">
             <div v-if="!$utils.isEmpty(row.appModule)" class="text-href" @click="toCientityView(row.appModule)">
-              <span class="tsfont-ci-o"></span>
+              <span :class="row.appModule.ciIcon"></span>
               <span>{{ row.appModule.name }}</span>
             </div>
           </template>
@@ -141,7 +141,7 @@
           <template v-slot:ci="{row}">
             <!-- 模型 -->
             <div v-if="!$utils.isEmpty(row.ci)" class="text-href" @click="toCiView(row.ci)">
-              <span class="tsfont-ci-o"></span>
+              <span :class="row.ci.ciIcon"></span>
               <span>{{ row.ci.label }}</span>
             </div>
           </template>
-- 
Gitee


From 6b55882c422d9e745774acce3735cd48080d5bb4 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Tue, 18 Mar 2025 16:03:50 +0800
Subject: [PATCH 15/20] =?UTF-8?q?[=E5=85=B3=E8=81=94]#[1349157963399168]CM?=
 =?UTF-8?q?DB=E5=BA=94=E7=94=A8=E6=B8=85=E5=8D=95=E6=94=B9=E6=88=90?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=B1=82=E7=BA=A7=E5=8F=AF=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=20http://192.168.0.96:8090/demo/rdm.html#/story-detail/9390509?=
 =?UTF-8?q?47543040/939050947543042/1349157963399168?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cmdb/newapplication/assets-manage.vue      | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/views/pages/cmdb/newapplication/assets-manage.vue b/src/views/pages/cmdb/newapplication/assets-manage.vue
index 0cab63c6a..c8edcd898 100644
--- a/src/views/pages/cmdb/newapplication/assets-manage.vue
+++ b/src/views/pages/cmdb/newapplication/assets-manage.vue
@@ -95,9 +95,13 @@
             </div>
           </template>
           <template v-slot:appEnvironment="{ row }">
-            <div v-if="!$utils.isEmpty(row.appEnvironment)" class="text-href" @click="toGlobalAttrManage()">
+            <Tag
+              v-if="!$utils.isEmpty(row.appEnvironment)"
+              class="cursor-pointer"
+              @click.native="toGlobalAttrManage()"
+            >
               {{ row.appEnvironment.value }}
-            </div>
+            </Tag>
           </template>
           <template v-slot:appSystem="{row}">
             <!-- 应用系统 -->
@@ -121,9 +125,13 @@
           </template>
           <template v-slot:state="{row}">
             <!-- 资产状态 -->
-            <div v-if="!$utils.isEmpty(row.state)" class="text-href" @click="toCientityView(row.state)">
+            <Tag
+              v-if="!$utils.isEmpty(row.state)"
+              class="cursor-pointer"
+              @click.native="toCientityView(row.state)"
+            >
               {{ row.state.name }}
-            </div>
+            </Tag>
           </template>
           <template v-slot:ownerList="{ row }">
             <div v-if="!$utils.isEmpty(row.ownerList)">
@@ -141,7 +149,7 @@
           <template v-slot:ci="{row}">
             <!-- 模型 -->
             <div v-if="!$utils.isEmpty(row.ci)" class="text-href" @click="toCiView(row.ci)">
-              <span :class="row.ci.ciIcon"></span>
+              <span :class="row.ci.icon"></span>
               <span>{{ row.ci.label }}</span>
             </div>
           </template>
-- 
Gitee


From be31b31252aa9b1ea733c97f19c47b7604a26ccc Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Fri, 21 Mar 2025 15:48:52 +0800
Subject: [PATCH 16/20] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=B7=A1=E6=A3=80?=
 =?UTF-8?q?-=E5=BA=94=E7=94=A8=E5=B7=A1=E6=A3=80=E8=B0=83=E6=95=B4=20=20-?=
 =?UTF-8?q?=20[=E5=85=B3=E8=81=94]=20#[1349157963399168]CMDB=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E6=B8=85=E5=8D=95=E6=94=B9=E6=88=90=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E5=B1=82=E7=BA=A7=E5=8F=AF=E9=85=8D=E7=BD=AE=20http://192.168.?=
 =?UTF-8?q?0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947?=
 =?UTF-8?q?543042/1349157963399168?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../applicationInspect/applicationInspect.js  |   4 +
 .../cmdb/newapplication/assets-manage.vue     |  44 +-
 .../ci-attr-setting-dialog.vue.vue            |   6 +-
 .../applicationNew/application-detail.vue     |   0
 .../applicationNew/application-manage.vue     | 332 ++++++++
 .../batch-module-inspection-dialog.vue        | 398 ++++++++++
 .../batch-system-inspection-dialog.vue        | 409 ++++++++++
 .../applicationNew/edit-cron-dialog.vue       | 135 ++++
 .../inspection-assets-manage.vue              | 458 +++++++++++
 .../inspection-schedule-dialog.vue            | 278 +++++++
 .../applicationNew/job-list-dialog.vue        |  95 +++
 .../latest-questions-manage.vue               | 720 ++++++++++++++++++
 .../threshold/app-threshold-rule-add.vue      | 485 ++++++++++++
 .../threshold/copy-rule-dialog.vue            | 145 ++++
 .../threshold/rule-of-threshold-detail.vue    | 173 +++++
 .../threshold/rule-of-threshold-dialog.vue    | 127 +++
 .../threshold/rule-of-threshold-manage.vue    | 157 ++++
 src/views/pages/inspect/router.js             |  13 +
 18 files changed, 3953 insertions(+), 26 deletions(-)
 create mode 100644 src/views/pages/inspect/applicationNew/application-detail.vue
 create mode 100644 src/views/pages/inspect/applicationNew/application-manage.vue
 create mode 100644 src/views/pages/inspect/applicationNew/batch-module-inspection-dialog.vue
 create mode 100644 src/views/pages/inspect/applicationNew/batch-system-inspection-dialog.vue
 create mode 100644 src/views/pages/inspect/applicationNew/edit-cron-dialog.vue
 create mode 100644 src/views/pages/inspect/applicationNew/inspection-assets-manage.vue
 create mode 100644 src/views/pages/inspect/applicationNew/inspection-schedule-dialog.vue
 create mode 100644 src/views/pages/inspect/applicationNew/job-list-dialog.vue
 create mode 100644 src/views/pages/inspect/applicationNew/latest-questions-manage.vue
 create mode 100644 src/views/pages/inspect/applicationNew/threshold/app-threshold-rule-add.vue
 create mode 100644 src/views/pages/inspect/applicationNew/threshold/copy-rule-dialog.vue
 create mode 100644 src/views/pages/inspect/applicationNew/threshold/rule-of-threshold-detail.vue
 create mode 100644 src/views/pages/inspect/applicationNew/threshold/rule-of-threshold-dialog.vue
 create mode 100644 src/views/pages/inspect/applicationNew/threshold/rule-of-threshold-manage.vue

diff --git a/src/resources/api/inspect/applicationInspect/applicationInspect.js b/src/resources/api/inspect/applicationInspect/applicationInspect.js
index 1b5de9dde..d63548137 100644
--- a/src/resources/api/inspect/applicationInspect/applicationInspect.js
+++ b/src/resources/api/inspect/applicationInspect/applicationInspect.js
@@ -5,6 +5,10 @@ const applicationInspect = {
     // 获取应用巡检列表
     return axios.post('/api/rest/inspect/appmodule/report/search', params);
   },
+  getNewapplicationInspectList(params) {
+    // 获取新的应用巡检列表
+    return axios.post('/api/rest/inspect/app/resource/list', params);
+  },
   getResourceTypeList(params) {
     // 发起应用巡检
     return axios.post('/api/rest/resourcecenter/appmodule/resource/type/list', params);
diff --git a/src/views/pages/cmdb/newapplication/assets-manage.vue b/src/views/pages/cmdb/newapplication/assets-manage.vue
index c8edcd898..6631aebdf 100644
--- a/src/views/pages/cmdb/newapplication/assets-manage.vue
+++ b/src/views/pages/cmdb/newapplication/assets-manage.vue
@@ -213,21 +213,21 @@ export default {
         rowNum: 0,
         pageSize: 20,
         currentPage: 1
-      },
-      theadList: [
-        { key: 'ip', title: this.$t('page.ipaddress')},
-        { key: 'name', title: this.$t('page.name')},
-        { key: 'monitorStatus', title: this.$t('term.inspect.monitoringstate')},
-        { key: 'inspectStatus', title: this.$t('term.autoexec.inspectstatus')},
-        { key: 'stateName', title: this.$t('term.autoexec.assetstatus')},
-        { key: 'envName', title: this.$t('term.inspect.envname')},
-        { key: 'clusterName', title: this.$t('term.inspect.clustername')},
-        { key: 'dataCenterName', title: this.$t('term.inspect.datacenter')},
-        { key: 'networkArea', title: this.$t('page.networkarea')},
-        { key: 'ownerList', title: this.$t('page.owner')},
-        { key: 'bgList', title: this.$t('term.autoexec.subordinatedepartment')},
-        { key: 'maintenanceWindow', title: this.$t('term.deploy.maintenancewindow')}
-      ]
+      }
+      // theadList: [
+      //   { key: 'ip', title: this.$t('page.ipaddress')},
+      //   { key: 'name', title: this.$t('page.name')},
+      //   { key: 'monitorStatus', title: this.$t('term.inspect.monitoringstate')},
+      //   { key: 'inspectStatus', title: this.$t('term.autoexec.inspectstatus')},
+      //   { key: 'stateName', title: this.$t('term.autoexec.assetstatus')},
+      //   { key: 'envName', title: this.$t('term.inspect.envname')},
+      //   { key: 'clusterName', title: this.$t('term.inspect.clustername')},
+      //   { key: 'dataCenterName', title: this.$t('term.inspect.datacenter')},
+      //   { key: 'networkArea', title: this.$t('page.networkarea')},
+      //   { key: 'ownerList', title: this.$t('page.owner')},
+      //   { key: 'bgList', title: this.$t('term.autoexec.subordinatedepartment')},
+      //   { key: 'maintenanceWindow', title: this.$t('term.deploy.maintenancewindow')}
+      // ]
     };
   },
   beforeCreate() {},
@@ -260,9 +260,11 @@ export default {
     },
     changePageSize(pageSize, item, index) {
       this.tableData.pageSize = pageSize;
+      this.tableData.currentPage = 1;
       this.getTableData(item, index);
     },
     async initData() {
+      this.tableData.currentPage = 1;
       await this.getEnvList();
       await this.getTableData();
     },
@@ -336,14 +338,9 @@ export default {
     toInspectStatusDetail(row) {
       // 巡检状态详情
       if (row && !this.$utils.isEmptyObj(row)) {
-        if (this.moduleName == 'inspect') {
-          // inspect模块
-          window.open(HOME + '/inspect.html#/assets-detail-' + row.id, '_blank');
-        } else {
-          // cmdb模块
-          if (this.$AuthUtils.hasRole('INSPECT_BASE')) {
-            window.open(HOME + '/cmdb.html#/inspect.html#/inspect-status-detail-' + row.id, '_blank');
-          }
+        // cmdb模块
+        if (this.$AuthUtils.hasRole('INSPECT_BASE')) {
+          window.open(HOME + '/cmdb.html#/inspect.html#/inspect-status-detail-' + row.id, '_blank');
         }
       }
     },
@@ -359,6 +356,7 @@ export default {
         }
       });
       this.envId = envId;
+      this.tableData.currentPage = 1;
       this.getTableData();
     },
     handleTimes(time) {
diff --git a/src/views/pages/cmdb/newapplication/ci-attr-setting-dialog.vue.vue b/src/views/pages/cmdb/newapplication/ci-attr-setting-dialog.vue.vue
index 3a26ad854..6d588bf70 100644
--- a/src/views/pages/cmdb/newapplication/ci-attr-setting-dialog.vue.vue
+++ b/src/views/pages/cmdb/newapplication/ci-attr-setting-dialog.vue.vue
@@ -134,7 +134,7 @@ export default {
   methods: {
     getApplicationlistSetting() {
       this.$api.cmdb.applicationManage.getApplicationlistSetting().then(res => {
-        if (res.Status == 'OK') {
+        if (res.Status == 'OK' && res.Return) {
           this.id = res.Return.id || null;
           this.config = res.Return.config || {};
           this.tableSettingList = this.config.tableSettingList || [];
@@ -148,9 +148,9 @@ export default {
     },
     addData(index) {
       if (index) {
-        this.tableSettingList.splice(index, 0, { viewName: '', fieldList: [] });
+        this.tableSettingList.splice(index, 0, { viewName: '', fieldList: [], _isShow: true });
       } else {
-        this.tableSettingList.push({ viewName: '', fieldList: [] });
+        this.tableSettingList.push({ viewName: '', fieldList: [], _isShow: true });
       }
     },
     deleteItem(index) {
diff --git a/src/views/pages/inspect/applicationNew/application-detail.vue b/src/views/pages/inspect/applicationNew/application-detail.vue
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/views/pages/inspect/applicationNew/application-manage.vue b/src/views/pages/inspect/applicationNew/application-manage.vue
new file mode 100644
index 000000000..d44fa355d
--- /dev/null
+++ b/src/views/pages/inspect/applicationNew/application-manage.vue
@@ -0,0 +1,332 @@
+<template>
+  <div>
+    <TsContain :siderWidth="220">
+      <template v-slot:topLeft>
+        <div class="action-group">
+          <span
+            v-if="$AuthUtils.hasRole('RESOURCECENTER_MODIFY')"
+            class="action-item tsfont-plus"
+            @click="addApp()"
+          >{{ $t('page.apply') }}</span>
+          <span
+            v-if="$AuthUtils.hasRole('RESOURCECENTER_MODIFY')"
+            class="action-item tsfont-plus"
+            @click="addAppModule()"
+          >{{ $t('page.module') }}</span>
+          <span
+            v-if="$AuthUtils.hasRole('INSPECT_SCHEDULE_EXECUTE')"
+            class="action-item tsfont-sla"
+            @click="openInspectionScheduleDialog()"
+          >{{ $t('term.inspect.scheduleinspect') }}</span>
+        </div>
+      </template>
+      <template v-slot:topRight>
+        <div v-if="$AuthUtils.hasRole('RESOURCECENTER_MODIFY') && (selectedApp && !selectedModule)" class="action-group">
+          <span
+            class="action-item tsfont-edit"
+            @click="editApp()"
+          >{{ $t('dialog.title.edittarget', {target: $t('page.apply')}) }}</span>
+          <span
+            class="action-item tsfont-trash-o"
+            @click="deleteApp()"
+          >{{ $t('dialog.title.deletetarget', {target: $t('page.apply')}) }}</span>
+          <span
+            class="action-item tsfont-setting"
+            @click="toRoleOfThreshold()"
+          >{{ $t('term.inspect.thresholdrule') }}</span>
+          <div class="action-item">
+            <Button
+              v-auth="'INSPECT_EXECUTE'"
+              type="primary"
+              class="ml-sm mr-sm"
+              @click="openSystemInspection"
+            >{{ $t('term.inspect.inspect') }}</Button>
+          </div>
+        </div>
+        <div v-else-if="$AuthUtils.hasRole('RESOURCECENTER_MODIFY')" class="action-group">
+          <span
+            class="action-item tsfont-edit"
+            @click="editAppModule()"
+          >{{ $t('dialog.title.edittarget', {target: $t('page.module')}) }}</span>
+          <span
+            class="action-item tsfont-trash-o"
+            @click="deleteAppModule()"
+          >{{ $t('dialog.title.deletetarget', {target: $t('page.module')}) }}</span>
+          <Button
+            v-auth="'INSPECT_EXECUTE'"
+            type="primary"
+            class="ml-sm mr-sm"
+            @click="openModuleInspectionDialog"
+          >{{ $t('term.inspect.inspect') }}</Button>
+        </div>
+      </template>
+      <template v-slot:sider>
+        <AppModuleTree
+          ref="appModuleTree"
+          v-model="appModueData"
+          :allowInverse="false"
+          @getSelectedApp="getSelectedApp"
+          @getSelectedModule="getSelectedModule"
+        ></AppModuleTree>
+      </template>
+      <template v-slot:content>
+        <Tabs
+          v-model="tabValue"
+          :animated="false"
+          class="block-tabs"
+          @on-click="tabClick"
+        >
+          <TabPane :label="$t('term.inspect.newproblem')" name="LatestQuestions">
+            <LatestQuestionsManage
+              v-if="tabValue == 'LatestQuestions'"
+              class="tab-height-box"
+              :appSystemId="appCiEntityId"
+              :appModuleId="appModuleId"
+            ></LatestQuestionsManage>
+          </TabPane>
+          <TabPane :label="$t('term.inspect.assetlist')" name="assetsList">
+            <InspectionAssetsManage
+              v-if="tabValue == 'assetsList'"
+              class="tab-height-box"
+              :appSystemId="appCiEntityId"
+              :appModuleId="appModuleId"
+              moduleName="inspect"
+            ></InspectionAssetsManage>
+          </TabPane>
+          <TabPane v-if="selectedApp && !selectedModule" :label="$t('term.deploy.applicationinformation')" name="applicationInfo">
+            <AppInfo v-if="tabValue == 'applicationInfo'" :appSystemId="appCiEntityId"></AppInfo>
+          </TabPane>
+          <TabPane v-else :label="$t('term.deploy.moduleinformation')" name="moduleInfo">
+            <ModuleInfo
+              v-if="tabValue == 'moduleInfo'"
+              :isShowTitle="false"
+              :appSystemId="appCiEntityId"
+              :appModuleId="appModuleId"
+            ></ModuleInfo>
+          </TabPane>
+        </Tabs>
+      </template>
+    </TsContain>
+    <AppEditDialog
+      v-if="isEditAppDialogShow"
+      :ciEntityId="appCiEntityId"
+      :ciId="appCiId"
+      @close="closeAppEditDialog"
+    ></AppEditDialog>
+    <AppModuleEditDialog
+      v-if="isEditAppModuleDialogShow"
+      :ciEntityId="appModuleCiEntityId"
+      :ciId="appModuleCiId"
+      :ciEntityData="ciEntityData"
+      @close="closeAppModuleEditDialog"
+    ></AppModuleEditDialog>
+    <DeleteCiEntityDialog
+      v-if="isDeleteDialogShow"
+      :allowDelete="true"
+      :allowCommit="true"
+      :ciEntityId="deleteCiEntityId"
+      @close="closeDeleteDialog"
+    ></DeleteCiEntityDialog>
+    <InspectionScheduleDialog v-if="isShowInspectionScheduleDialog" :id="scheduleId" @close="isShowInspectionScheduleDialog = false"></InspectionScheduleDialog>
+    <BatchSystemInspectionDialog
+      v-if="isShowBatchInspectionDialog"
+      :inspectionData="selectedApp"
+      @close="isShowBatchInspectionDialog = false"
+    ></BatchSystemInspectionDialog>
+    <BatchModuleInspectionDialog
+      v-if="isShowBatchModuleInspectionDialog"
+      :inspectionData="selectedModule"
+      :appSystemId="appCiEntityId"
+      @close="isShowBatchModuleInspectionDialog = false"
+    ></BatchModuleInspectionDialog>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    AppInfo: () => import('@/views/pages/deploy/application-config/config/app/app-info.vue'),
+    ModuleInfo: () => import('@/views/pages/deploy/application-config/config/module/module-info'),
+    AppEditDialog: () => import('@/views/pages/cmdb/application/app-edit-dialog.vue'),
+    AppModuleEditDialog: () => import('@/views/pages/cmdb/application/appmodule-edit-dialog.vue'),
+    DeleteCiEntityDialog: () => import('@/views/pages/cmdb/cientity/cientity-delete-dialog.vue'),
+    InspectionScheduleDialog: () => import('./inspection-schedule-dialog.vue'),
+    AppModuleTree: () => import('@/views/pages/cmdb/application/app-module-tree'), // 应用模块树
+    LatestQuestionsManage: () => import('./latest-questions-manage'), // 最新问题
+    InspectionAssetsManage: () => import('./inspection-assets-manage'), // 资产清单
+    BatchSystemInspectionDialog: () => import('./batch-system-inspection-dialog'), // 批量应用巡检
+    BatchModuleInspectionDialog: () => import('./batch-module-inspection-dialog') // 批量模块巡检
+  },
+  props: {},
+  data() {
+    return {
+      tabValue: '',
+      isApp: true,
+      isEditAppDialogShow: false,
+      isEditAppModuleDialogShow: false,
+      isDeleteDialogShow: false,
+      isShowBatchInspectionDialog: false,
+      isShowBatchModuleInspectionDialog: false,
+      appCiEntityId: null,
+      appCiId: null,
+      appModuleCiId: null,
+      appModuleId: null,
+      deleteCiEntityId: null,
+      selectedApp: null,
+      selectedModule: null,
+      appModueData: {},
+      ciEntityData: {},
+      isShowInspectionScheduleDialog: false,
+      scheduleId: null
+    };
+  },
+  beforeCreate() {},
+  created() {
+    if (this.$route.query.scheduleId) {
+      this.scheduleId = Number(this.$route.query.scheduleId);
+    }
+    if (this.$route.query.isShowInspectionScheduleDialog) {
+      this.isShowInspectionScheduleDialog = this.$route.query.isShowInspectionScheduleDialog;
+    }
+    this.getResourceEntity();
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    openSystemInspection() {
+      this.isShowBatchInspectionDialog = true;
+    },
+    openModuleInspectionDialog() {
+      this.isShowBatchModuleInspectionDialog = true;
+    },
+    tabClick() {
+      this.$addHistoryData('tabValue', this.tabValue);
+    },
+    restoreHistory(historyData) {
+      this.tabValue = historyData['tabValue'];
+    },
+    getSelectedApp(app) {
+      this.selectedApp = app;
+      this.appCiEntityId = app ? app.id : null;
+      this.tabValue = (this.tabValue && this.tabValue == 'moduleInfo' ? 'LatestQuestions' : this.tabValue) || 'LatestQuestions'; // 选中模块信息，但是切换到应用层，tab需要默认选中第一个
+    },
+    getSelectedModule(module) {
+      this.selectedModule = module;
+      this.appModuleId = module ? module.id : null;
+      this.tabValue = (this.tabValue && this.tabValue == 'applicationInfo' ? 'LatestQuestions' : this.tabValue) || 'LatestQuestions'; // 选中应用信息，但是切换到模块层，tab需要默认选中第一个
+    },
+    addApp() {
+      this.appCiEntityId = null;
+      this.isEditAppDialogShow = true;
+    },
+    editApp() {
+      this.appCiEntityId = this.selectedApp ? this.selectedApp.id : null;
+      this.isEditAppDialogShow = true;
+    },
+    editAppModule() {
+      this.appModuleCiEntityId = this.appModuleId;
+      this.isEditAppModuleDialogShow = true;
+    },
+    async addAppModule() {
+      await this.getRelEntityData();
+      this.appModuleCiEntityId = null;
+      this.isEditAppModuleDialogShow = true;
+    },
+    deleteApp() {
+      this.deleteCiEntityId = this.appCiEntityId;
+      this.isDeleteDialogShow = true;
+    },
+    deleteAppModule() {
+      this.deleteCiEntityId = this.appModuleId;
+      this.isDeleteDialogShow = true;
+    },
+    closeAppEditDialog(needRefresh, uuid) {
+      this.isEditAppDialogShow = false;
+      if (needRefresh && uuid) {
+        // 添加应用成功，刷新树列表
+        this.$refs.appModuleTree.refreshApp(uuid);
+      }
+    },
+    closeAppModuleEditDialog(needRefresh, uuid) {
+      this.isEditAppModuleDialogShow = false;
+      if (needRefresh && uuid) {
+        // 添加编辑模块成功，刷新树列表
+        this.$refs.appModuleTree.refreshModule(uuid, this.appCiEntityId);
+      }
+    },
+    closeDeleteDialog(needRefresh) {
+      this.isDeleteDialogShow = false;
+      if (needRefresh) {
+        // 删除应用成功，刷新树列表
+        this.appModueData = {
+          appId: this.appCiEntityId // 删除成功后，默认选中当前应用层
+        };
+        this.$refs.appModuleTree.searchAppSystem();
+      }
+    },
+    getResourceEntity() {
+      this.$api.cmdb.applicationManage.getResourceEntityByName('scence_appsystem').then(res => {
+        if (res.Return && res.Return.ciId) {
+          this.appCiId = res.Return.ciId;
+        }
+      });
+      this.$api.cmdb.applicationManage.getResourceEntityByName('scence_appmodule').then(res => {
+        if (res.Return && res.Return.ciId) {
+          this.appModuleCiId = res.Return.ciId;
+        }
+      });
+    },
+    async getRelEntityData() {
+      // 设置添加模块时，默认选中当前应用
+      this.ciEntityData = {};
+      if (this.appModuleCiId) {
+        let relList = [];
+        let relEntityData = {};
+        await this.$api.cmdb.ci.getRelByCiId(this.appModuleCiId, {needAction: false, showType: 'all'}).then(res => {
+          relList = res.Return || [];
+          relList.forEach(element => {
+            if ((element.direction === 'from' && element.fromCiId == this.appModuleCiId && element.toCiId == this.appCiId) ||
+            (element.direction === 'to' && element.toCiId == this.appModuleCiId && element.fromCiId == this.appCiId)) {
+              relEntityData[`rel${element.direction}_${element.id}`] = {
+                'valueList': [
+                  {
+                    'ciEntityName': this.selectedApp.name, // 应用层的name
+                    'ciEntityId': this.selectedApp.id, // 应用的id
+                    'ciId': this.appModuleCiId
+                  }
+                ]
+              };
+            }
+          });
+          this.ciEntityData = {uuid: this.$utils.setUuid(), relEntityData: relEntityData};
+        });
+      }
+    },
+    openInspectionScheduleDialog() {
+      this.isShowInspectionScheduleDialog = true;
+    },
+    toRoleOfThreshold() {
+      // 阈值规则
+      this.$router.push({
+        path: './rule-of-threshold-manage',
+        query: {appSystemId: this.appCiEntityId}
+      });
+    }
+  },
+  filter: {},
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang="less" scoped>
+.tab-height-box {
+  height: calc(100vh - 100px - 50px); // 100 通栏的表头+导航栏， 50是（tab(高度)+16(底部的间距)
+  overflow-y: auto;
+}
+</style>
diff --git a/src/views/pages/inspect/applicationNew/batch-module-inspection-dialog.vue b/src/views/pages/inspect/applicationNew/batch-module-inspection-dialog.vue
new file mode 100644
index 000000000..c99fa59e0
--- /dev/null
+++ b/src/views/pages/inspect/applicationNew/batch-module-inspection-dialog.vue
@@ -0,0 +1,398 @@
+<template>
+  <div class="batch-inspection-dialog-box">
+    <TsDialog v-bind="dialogSetting" @on-close="closeDialog">
+      <template v-slot:header>
+        <div>
+          <span>{{ $t('term.inspect.moduleinspect') }}</span>
+          <span style="font-weight: normal;" class="tips text-grey pl-xs">{{ inspectionData.abbrName }} {{ inspectionData.name ? inspectionData.name : '' }}</span>
+        </div>
+      </template>
+      <Loading
+        :loadingShow="loadingShow"
+        type="fix"
+      ></Loading>
+      <ul v-if="hasAssets">
+        <li v-if="!$utils.isEmpty(envList)" class="mt-md">
+          <TsFormCheckbox v-model="checkboxModel" :dataList="checkboxAllDataList" @on-change="checkboxAllChange"></TsFormCheckbox>
+        </li>
+        <li v-if="$utils.isEmpty(envList)" class="text-tip mt-md">
+          {{ $t('term.inspect.noenvconfig') }}
+        </li>
+        <template v-else>
+          <li v-for="(item, index) in envList" :key="index" class="mb-md">
+            <div v-if="item.env && item.env.id && !$utils.isEmpty(item.ciVoList)" class="mb-md mt-md">
+              <TsFormCheckbox
+                v-model="item.value"
+                :dataList="item.dataList"
+                :disabled="$utils.isEmpty(item.ciVoList)"
+                class="checkbox-list-box"
+                @on-change="() => checkboxChange()"
+              ></TsFormCheckbox>
+            </div>
+          </li>
+        </template>
+      </ul>
+      <div v-else>{{ $t('term.inspect.modulenoasset') }}</div>
+      <template v-slot:footer>
+        <div>
+          <Button :ghost="true" @click="closeDialog">{{ $t('page.cancel') }}</Button>
+          <Button v-if="hasAssets" type="primary" @click="okDialog">{{ $t('page.continue') }}</Button>
+        </div>
+      </template>
+    </TsDialog>
+    <TsDialog
+      :title="$t('page.tip')"
+      :okText="$t('page.continue')"
+      width="medium"
+      :isShow="isShowCompobList"
+      @on-close="closeCompobDialog"
+    >
+      <ul>
+        <li v-for="(item, index) in noCompobIdList" :key="index" class="flex-start mb-sm">
+          {{ item.label }}
+          <span v-if="item.toolName" class="text-grey">({{ item.toolName }})</span>
+          {{ $t('page.notconfig') }}
+          <span v-if="$AuthUtils.hasRole('INSPECT_MODIFY')" class="text-href" @click="openInspectionTool(item.toolName)">{{ $t('term.inspect.inspecttool') }}</span>
+          <span v-else class="text-grey">{{ $t('term.inspect.inspecttool') }}</span>
+        </li>
+      </ul>
+      <template v-slot:footer>
+        <div>
+          <Button :ghost="true" @click="closeCompobDialog">{{ $t('page.cancel') }}</Button>
+          <Button v-if="hasContinueBtn" type="primary" @click="confirm">{{ $t('page.continue') }}</Button>
+        </div>
+      </template>
+    </TsDialog>
+    <InspectToolSetting v-if="isShowInspectTool" :keyword="toolName" @close="closeInspectToolSetting"></InspectToolSetting>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    TsFormCheckbox: () => import('@/resources/plugins/TsForm/TsFormCheckbox'),
+    InspectToolSetting: () => import('@/views/pages/inspect/definition/components/inspect-tool-setting')
+  },
+  filters: {},
+  props: {
+    inspectionData: {
+      type: Object,
+      default: () => ({})
+    },
+    appSystemId: {
+      // 应用id
+      type: Number,
+      default: null
+    }
+  },
+  data() {
+    return {
+      dialogSetting: {
+        isShow: true,
+        width: 'medium'
+      },
+      checkboxAllDataList: [
+        {
+          text: this.$t('page.selectall'),
+          value: 'all'
+        }
+      ],
+      compobList: [],
+      checkboxModel: [],
+      envList: [],
+      noCompobIdList: [], // 无组合工具id列表
+      isShowCompobList: false,
+      isShowInspectTool: false,
+      toolName: '',
+      loadingShow: false,
+      hasContinueBtn: false
+    };
+  },
+  beforeCreate() {},
+  created() {
+    this.getInspectionList();
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    async closeInspectToolSetting(needRefresh) {
+      // 关闭巡检
+      this.isShowInspectTool = false;
+      // if (needRefresh) {
+      //   this.isShowCompobList = false;
+      //   await this.okDialog();
+      // }
+    },
+    checkboxAllChange(val) {
+      if (val && val.length > 0) {
+        this.checkboxModel = ['all'];
+        this.envList &&
+          this.envList.forEach(item => {
+            item.value = this.getIdByDataList(item.dataList, item.ciVoList);
+          });
+      } else {
+        this.checkboxModel = [];
+        this.envList &&
+          this.envList.forEach(item => {
+            item.value = [];
+          });
+      }
+    },
+    checkboxChange() {
+      let checkboxList = this.envList.filter((item) => {
+        return item.value && item.value.length > 0 && item.ciVoList.length > 0;
+      });
+      let envList = this.envList.filter((item) => {
+        return item.ciVoList && item.ciVoList.length > 0;
+      });
+      if (checkboxList && !this.$utils.isEmpty(checkboxList) && !this.$utils.isEmpty(envList) && (checkboxList.length == envList.length)) {
+        // 全选选中
+        this.checkboxModel = ['all'];
+      } else {
+        this.checkboxModel = [];
+      }
+    },
+    getInspectionList() {
+      this.checkboxModel = [];
+      this.envList = [];
+      this.$set(this.dialogSetting, 'isShow', true);
+      this.loadingShow = true;
+      this.$api.inspect.applicationInspect
+        .getResourceTypeList({ appModuleId: this.inspectionData.id })
+        .then(res => {
+          if (res && res.Status == 'OK') {
+            this.envList = res.Return;
+            this.envList &&
+              this.envList.forEach(item => {
+                item.dataList = [{ text: item.env && item.env.name ? `${item.env.name}${this.$t('page.environment')}` : '', value: item.env && item.env.id ? item.env.id : null }];
+                item.value = [];
+              });
+          }
+        })
+        .finally(() => {
+          this.loadingShow = false;
+        });
+    },
+    getIdByDataList(dataList, ciVoList) {
+      let idList = [];
+      dataList &&
+        dataList.forEach(item => {
+          if (!this.$utils.isEmpty(ciVoList)) {
+            // 处理没有的数据
+            idList.push(item.value);
+          }
+        });
+      return idList;
+    },
+    isValid() {
+      let isValid = true;
+      let copyEnvList = this.$utils.deepClone(this.envList);
+      if (copyEnvList && !this.$utils.isEmpty(copyEnvList)) {
+        let emptyList = copyEnvList.filter(val => {
+          return !this.$utils.isEmpty(val.value);
+        });
+        if (this.$utils.isEmpty(emptyList)) {
+          this.$Message.warning(this.$t('term.inspect.selectenv'));
+          isValid = false;
+        }
+      }
+      return isValid;
+    },
+    getEnvList() {
+      let envList = [];
+      let copyEnvList = this.$utils.deepClone(this.envList);
+      copyEnvList && copyEnvList.forEach((env) => {
+        if (env && !this.$utils.isEmpty(env.value)) {
+          let envIdList = env.value.filter(envId => envId && envId != '');
+          if (envIdList && envIdList.length > 0) {
+            envIdList.forEach(envId => {
+              envList.push({
+                envId: envId,
+                appModuleIdList: [this.inspectionData.id]
+              });
+            });
+          }
+        }
+      });
+      return envList;
+    },
+    confirm() {
+      if (!this.isValid()) {
+        return false;
+      }
+      let envList = this.getEnvList();
+      const param = {
+        appSystemId: this.appSystemId,
+        envList: envList
+      };
+      this.$api.inspect.applicationInspect.createInspectAppJob(param).then((res) => {
+        this.loadingShow = true;
+        if (res.Status == 'OK') {
+          this.$Message.success(this.$t('message.executesuccess'));
+          this.loadingShow = false;
+          this.dialogSetting.isShow = false;
+          this.isShowCompobList = false;
+          this.closeDialog();
+        }
+      }).finally(() => {
+        this.loadingShow = false;
+      });
+    },
+    async okDialog() {
+      // 执行操作
+      this.compobList = [];
+      let flag = 0;
+      let envList = this.$utils.deepClone(this.envList) || [];
+      if (!this.isValid()) {
+        return false;
+      }
+      this.loadingShow = true;
+      for (let i = 0; i < envList.length; i++) {
+        if (envList[i] && envList[i].ciVoList.length > 0 && (envList[i].value && envList[i].value.length > 0)) {
+          for (let v = 0; v < envList[i].ciVoList.length; v++) {
+            if (envList[i].ciVoList[v]) {
+              flag++;
+              await this.$api.inspect.applicationInspect.getCombopIdByTypeId({ ciId: envList[i].ciVoList[v].id, resourceId: null }).then(innerRes => {
+                if (innerRes.Status == 'OK') {
+                  let returnValue = innerRes.Return;
+                  if (returnValue && returnValue.isHasBindCombop == 1) {
+                    this.compobList.push({
+                      combopId: returnValue.combop ? returnValue.combop.id : null,
+                      id: envList[i].ciVoList[v].id,
+                      label: envList[i].ciVoList[v].label,
+                      envId: envList[i].env.id
+                    });
+                  } else {
+                    this.noCompobIdList.push({
+                      id: envList[i].ciVoList[v].id,
+                      label: envList[i].ciVoList[v].label,
+                      toolName: envList[i].ciVoList[v].name
+                    });
+                  }
+                }
+              }).finally(() => {
+                let ajaxNumber = 0;
+                envList && envList.forEach((fv) => {
+                  fv && !this.$utils.isEmpty(fv.value) && fv.ciVoList && fv.ciVoList.forEach((fn) => {
+                    if (fn && fn.id) {
+                      ajaxNumber++;
+                    }
+                  });
+                });
+                if (ajaxNumber && flag && ajaxNumber == flag) {
+                  this.loadingShow = false;
+                }
+              });
+            }
+          }
+        }
+      }
+      this.noCompobIdList = this.$utils.uniqueByField(this.noCompobIdList, 'id'); // 数组去重
+      if (this.$utils.isEmpty(this.noCompobIdList)) {
+        // this.handleContinue();
+        this.confirm();
+      } else {
+        this.isShowCompobList = true;
+        if (this.$utils.isEmpty(this.compobList)) {
+          this.hasContinueBtn = false; // 一个配置都没有，不显示继续按钮
+        } else {
+          this.hasContinueBtn = true;
+        }
+      }
+    },
+    closeCompobDialog() {
+      this.noCompobIdList = [];
+      this.isShowCompobList = false;
+    },
+    closeDialog() {
+      this.$emit('close');
+    },
+    handleContinue() {
+      // 继续执行
+      let flag = 0;
+      let paramsList = [];
+      let handleDataList = [];
+      this.loadingShow = true;
+      this.compobList.forEach(item => {
+        let tempObj = handleDataList.find((v) => v.id == item.id);
+        if (tempObj) {
+          tempObj.envIdList.push(item.envId);
+        } else {
+          handleDataList.push({
+            envId: item.envId,
+            id: item.id,
+            label: item.label,
+            combopId: item.combopId,
+            envIdList: [item.envId]
+          });
+        }
+      });
+      handleDataList.forEach(v => {
+        if (v && v.id && v.combopId) {
+          paramsList.push({
+            combopId: v.combopId,
+            name: v.label,
+            source: 'inspectapp',
+            invokeId: v.id,
+            routeId: this.appSystemId,
+            roundCount: 64,
+            param: {},
+            executeConfig: {
+              executeNodeConfig: {
+                filter: {
+                  typeIdList: [v.id],
+                  envIdList: v.envIdList,
+                  appModuleIdList: [this.inspectionData.id],
+                  appSystemIdList: [this.appSystemId]
+                }
+              }
+            }
+          });
+        }
+      });
+      paramsList &&
+        paramsList.forEach(item => {
+          this.$api.inspect.applicationInspect.executeInspect(item).then(res => {
+            if (res.Status == 'OK') {
+              flag++;
+              if (flag == paramsList.length) {
+                this.$Message.success(this.$t('message.executesuccess'));
+                this.loadingShow = false;
+                this.dialogSetting.isShow = false;
+                this.isShowCompobList = false;
+              }
+            }
+          }).catch(() => {
+            this.loadingShow = false;
+          });
+        });
+    },
+    openInspectionTool(toolName) {
+      // 打开巡检定义页面
+      this.toolName = toolName || '';
+      this.isShowInspectTool = true;
+    }
+  },
+  computed: {
+    hasAssets() {
+      // 是否有关联资产
+      let ciVoList = this.envList && this.envList.filter((v) => {
+        return v && v.ciVoList && v.ciVoList.length > 0;
+      });
+      if (this.$utils.isEmpty(ciVoList)) {
+        return false;
+      } else {
+        return true;
+      }
+    }
+  },
+  watch: {}
+};
+</script>
+<style lang="less" scoped></style>
diff --git a/src/views/pages/inspect/applicationNew/batch-system-inspection-dialog.vue b/src/views/pages/inspect/applicationNew/batch-system-inspection-dialog.vue
new file mode 100644
index 000000000..8716c2c9f
--- /dev/null
+++ b/src/views/pages/inspect/applicationNew/batch-system-inspection-dialog.vue
@@ -0,0 +1,409 @@
+<template>
+  <div class="batch-inspection-dialog-box">
+    <TsDialog
+      :isShow="true"
+      @on-close="closeDialog"
+    >
+      <Loading
+        :loadingShow="loadingShow"
+        type="fix"
+      ></Loading>
+      <template v-slot:header>
+        <div>
+          <span>{{ $t('term.inspect.appinspect') }}</span>
+          <span style="font-weight: normal;" class="tips text-grey pl-xs">{{ inspectionData.abbrName }} {{ inspectionData.name ? (inspectionData.name) : '' }}</span>
+        </div>
+      </template>
+      <ul v-if="!$utils.isEmpty(envModuleList)">
+        <li class="mt-md">
+          <TsFormCheckbox
+            v-model="checkboxModel"
+            :dataList="checkboxAllDataList"
+            @on-change="checkboxAllChange"
+          ></TsFormCheckbox>
+        </li>
+        <li v-for="(item, index) in envModuleList" :key="index">
+          <div class="h4 mb-md mt-md">{{ item.name }}{{ $t('page.environment') }}</div>
+          <TsFormCheckbox
+            v-model="item.value"
+            :dataList="item.appModuleList"
+            valueName="id"
+            textName="label"
+            class="checkbox-list-box"
+            @on-change="(selectedList) => changeCheckbox(selectedList, item, index)"
+          ></TsFormCheckbox>
+        </li>
+      </ul>
+      <div v-else class="mt-md">{{ $t('term.inspect.appnoasset') }}</div>
+      <template v-slot:footer>
+        <div>
+          <Button :ghost="true" @click="closeDialog">{{ $t('page.cancel') }}</Button>
+          <Button v-if="!$utils.isEmpty(envModuleList)" type="primary" @click="confirm">{{ $t('page.continue') }}</Button>
+        </div>
+      </template>
+    </TsDialog>
+    <TsDialog
+      :title="$t('page.tip')"
+      :isShow="isShowCompobDialog"
+      @on-close="closeCompobDialog"
+    >
+      <ul>
+        <li v-for="(item, index) in noCompobIdList" :key="index" class="flex-start mb-nm">
+          {{ item.label }}<span v-if="item.typeName" class="text-grey">({{ item.typeName }})</span>
+          {{ $t('page.notconfig') }}<span v-if="$AuthUtils.hasRole('INSPECT_MODIFY')" class="text-href" @click="openInspectionTool(item.typeName)">{{ $t('term.inspect.inspecttool') }}</span>
+          <span v-else class="text-grey">{{ $t('term.inspect.inspecttool') }}</span>
+        </li>
+      </ul>
+      <template v-slot:footer>
+        <div>
+          <Button :ghost="true" @click="closeCompobDialog">{{ $t('page.cancel') }}</Button>
+          <Button v-if="hasContinueBtn" type="primary" @click="okCompobDialog">{{ $t('page.continue') }}</Button>
+        </div>
+      </template>
+    </TsDialog>
+    <InspectToolSetting v-if="isShowInspectTool" :keyword="typeName" @close="closeInspectToolSetting"></InspectToolSetting>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    TsFormCheckbox: () => import('@/resources/plugins/TsForm/TsFormCheckbox'),
+    InspectToolSetting: () => import('@/views/pages/inspect/definition/components/inspect-tool-setting')
+  },
+  filters: {},
+  props: {
+    inspectionData: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      checkboxAllDataList: [{
+        text: this.$t('page.selectall'),
+        value: 'all'
+      }],
+      defaultDialogList: [],
+      checkboxModel: [],
+      envModuleList: [],
+      noCompobIdList: [], // 巡检没有配置组合工具列表
+      subDataList: [],
+      isShowCompobDialog: false,
+      hasContinueBtn: false,
+      loadingShow: false,
+      isShowInspectTool: false,
+      typeName: '' // 巡检工具名称
+    };
+  },
+  beforeCreate() {},
+  created() {
+    this.getInspectionList();
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    async closeInspectToolSetting(needRefresh) {
+      this.isShowInspectTool = false;
+      // if (needRefresh) {
+      //   this.isShowCompobDialog = false;
+      //   await this.okDialog();
+      // }
+    },
+    changeCheckbox(selectedList, row, index) {
+      let appModuleList = this.$utils.deepClone(row.appModuleList);
+      let filterCiVoList = [];
+      let allListNumber = null; // 总条数
+      let selectedListNumber = null; // 选中数量
+      if (row.checkboxFlag == 'all' || row.checkboxFlag == 'cancel') {
+        filterCiVoList = appModuleList && appModuleList.filter((val) => {
+          return val.id;
+        });
+      }
+      if (selectedList && selectedList.length != row.appModuleList.length && row.checkboxFlag == 'all' && selectedList.includes('')) {
+        // 取消单个
+        row.value = row.value.filter((val) => val);
+        row.checkboxFlag = 'cancel';
+        this.$set(this.envModuleList, index, row);
+        this.checkboxModel = [];
+      } else if (selectedList && selectedList.length == 1 && selectedList.includes('') && row.checkboxFlag == 'all') {
+        // 点击所有，全选
+        row.value = this.getIdByAppModuleList(row.appModuleList);
+        row.checkboxFlag = 'all';
+        this.$set(this.envModuleList, index, row);
+      } else if (selectedList && selectedList.length == filterCiVoList.length && row.checkboxFlag == 'all' && !selectedList.includes('')) {
+        // 点击所有，取消
+        row.value = [];
+        row.checkboxFlag = 'cancel';
+        this.$set(this.envModuleList, index, row);
+        this.checkboxModel = [];
+      } else if (selectedList && selectedList.length == filterCiVoList.length && row.checkboxFlag == 'cancel' && !selectedList.includes('')) {
+        row.value = this.getIdByAppModuleList(row.appModuleList);
+        row.checkboxFlag = 'all';
+        this.$set(this.envModuleList, index, row);
+      } else if (selectedList && row.checkboxFlag == 'cancel' && selectedList.includes('')) {
+        row.value = this.getIdByAppModuleList(row.appModuleList);
+        row.checkboxFlag = 'all';
+        this.$set(this.envModuleList, index, row);
+      }
+      this.envModuleList && this.envModuleList.forEach((val) => {
+        allListNumber += val.appModuleList.length; // 所有的数量
+        selectedListNumber += val.value.length;
+      });
+      if (allListNumber == selectedListNumber) {
+        this.checkboxModel = ['all']; // 全选勾选
+      }
+    },
+    checkboxAllChange(val) {
+      if (val && val.length > 0) {
+        this.envModuleList && this.envModuleList.forEach((item) => {
+          item.value = this.getIdByAppModuleList(item.appModuleList);
+          item.checkboxFlag = 'all';
+        });
+      } else {
+        this.envModuleList && this.envModuleList.forEach((item) => {
+          item.value = [];
+          item.checkboxFlag = 'cancel';
+        });
+      }
+    },
+    getInspectionList() {
+      this.checkboxModel = [];
+      this.loadingShow = true;
+      let params = {
+        appSystemId: this.inspectionData.id
+      };
+      this.$api.inspect.applicationInspect.getInspectionList(params).then((res) => {
+        if (res && res.Status == 'OK') {
+          this.envModuleList = res.Return;
+          this.envModuleList && this.envModuleList.forEach((item) => {
+            item && item.appModuleList.forEach((v) => {
+              v.label = v.abbrName ? (v.name ? `${v.abbrName}(${v.name})` : v.abbrName) : v.name || '';
+            });
+            item.appModuleList.unshift({
+              label: this.$t('term.deploy.allmodule'),
+              id: ''
+            });
+            item.checkboxFlag = 'cancel';
+            item.value = [];
+          });
+        }
+      }).finally(() => {
+        this.loadingShow = false;
+      });
+    },
+    getIdByAppModuleList(appModuleList) {
+      // 获取id列表，根据模块id
+      let idList = [];
+      appModuleList && appModuleList.forEach((item) => {
+        idList.push(item.id);
+      });
+      return idList;
+    },
+    isValid() {
+      let isValid = true;
+      let copyEnvModuleList = this.$utils.deepClone(this.envModuleList);
+      if (copyEnvModuleList && !this.$utils.isEmpty(copyEnvModuleList)) {
+        let emptyList = copyEnvModuleList.filter((val) => {
+          return !this.$utils.isEmpty(val.value);
+        });
+        if (this.$utils.isEmpty(emptyList)) {
+          this.$Message.warning(this.$t('term.inspect.selectmodule'));
+          isValid = false;
+        }
+      }
+      return isValid;
+    },
+    getEnvList() {
+      let envList = [];
+      let copyEnvModuleList = this.$utils.deepClone(this.envModuleList);
+      copyEnvModuleList && copyEnvModuleList.forEach((env) => {
+        if (env && env.appModuleList && env.appModuleList.length > 0 && !this.$utils.isEmpty(env.value)) {
+          let moduleIdList = env.value.filter(moduleId => moduleId && moduleId != '');
+          if (moduleIdList && moduleIdList.length > 0) {
+            envList.push({
+              envId: env.id,
+              appModuleIdList: moduleIdList
+            });
+          }
+        }
+      });
+      return envList;
+    },
+    confirm() {
+      if (!this.isValid()) {
+        return false;
+      }
+      let envList = this.getEnvList();
+      const param = {
+        appSystemId: this.inspectionData.id,
+        envList: envList
+      };
+      this.$api.inspect.applicationInspect.createInspectAppJob(param).then((res) => {
+        this.loadingShow = true;
+        if (res.Status == 'OK') {
+          this.$Message.success(this.$t('message.executesuccess'));
+          this.isShowCompobDialog = false;
+          this.closeDialog();
+        }
+      }).finally(() => {
+        this.loadingShow = false;
+      });
+    },
+    handleDataList() {
+      // 处理获取组合工具id的数据
+      let dataList = [];
+      let copyEnvModuleList = this.$utils.deepClone(this.envModuleList);
+      copyEnvModuleList && copyEnvModuleList.forEach((a) => {
+        if (a && a.appModuleList && a.appModuleList.length > 0 && !this.$utils.isEmpty(a.value)) {
+          a.appModuleList.forEach((b) => {
+            if (b && b.ciList && !this.$utils.isEmpty(b.ciList)) {
+              b.ciList.forEach((c) => {
+                if (c && c.id) {
+                  dataList.push({
+                    envId: a.id,
+                    appModuleId: b.id,
+                    ciLabel: c.label,
+                    ciId: c.id,
+                    typeName: c.name,
+                    value: a.value.includes(b.id) ? a.value : []
+                  });
+                }
+              });
+            }
+          });
+        }
+      });
+      return dataList;
+    },
+    async okDialog() {
+      // 执行操作
+      this.noCompobIdList = [];
+      if (!this.isValid()) {
+        return false;
+      }
+      this.loadingShow = true;
+      let ajaxFinishedFlag = 0;
+      let dataList = this.handleDataList();
+      let submitDataList = [];
+      for (let i = 0; i < dataList.length; i++) {
+        if (dataList[i] && dataList[i].value && dataList[i].value.length > 0) {
+          await this.$api.inspect.applicationInspect.getCombopIdByTypeId({ciId: dataList[i].ciId, resourceId: null}).then((res) => {
+            if (res.Status == 'OK') {
+              let returnValue = res.Return;
+              ajaxFinishedFlag = ajaxFinishedFlag + 1;
+              if (returnValue && returnValue.isHasBindCombop == 1) {
+                dataList[i].combopId = returnValue.combop ? returnValue.combop.id : null;
+              } else if (returnValue && returnValue.isHasBindCombop == 0) {
+                // 没有绑定组合工具
+                this.noCompobIdList.push({
+                  id: dataList[i].ciId,
+                  label: dataList[i].ciLabel,
+                  typeName: dataList[i].typeName
+                });
+              }
+            }
+          }).finally(() => {
+            let ajaxNumber = dataList.filter((v) => {
+              return v.value && v.value.length > 0;
+            });
+            if (ajaxFinishedFlag == ajaxNumber.length) {
+              this.loadingShow = false;
+            }
+          });
+        }
+      }
+      dataList.forEach((item) => {
+        // 合并appModuleIdList
+        if (item && item.combopId) {
+          let tempObj = submitDataList.find((v) => v.envId == item.envId && v.ciId == item.ciId);
+          if (tempObj) {
+            tempObj.appModuleIdList.push(item.appModuleId);
+          } else {
+            submitDataList.push({
+              envId: item.envId,
+              ciId: item.ciId,
+              ciLable: item.ciLabel,
+              appModuleId: item.appModuleId,
+              appModuleIdList: [item.appModuleId],
+              combopId: item.combopId
+            });
+          }
+        }
+      });
+      this.subDataList = [];
+      submitDataList.forEach((item) => {
+        this.subDataList.push({
+          combopId: item.combopId,
+          name: item.ciLable,
+          source: 'inspectapp',
+          invokeId: item.ciId,
+          routeId: this.inspectionData.id,
+          roundCount: 64,
+          param: {},
+          executeConfig: {
+            executeNodeConfig: {
+              filter: {
+                typeIdList: [item.ciId],
+                envIdList: [item.envId],
+                appModuleIdList: item.appModuleIdList,
+                appSystemIdList: [this.inspectionData.id]
+              }
+            }
+          }
+        });
+      });
+      this.noCompobIdList = this.$utils.uniqueByField(this.noCompobIdList, 'id'); // 数组去重
+      if (!this.$utils.isEmpty(this.noCompobIdList)) {
+        this.isShowCompobDialog = true;
+        if (this.$utils.isEmpty(submitDataList)) {
+          this.hasContinueBtn = false; // 一个配置工具都没有，则不显示继续按钮
+        } else {
+          this.hasContinueBtn = true;
+        }
+      } else {
+        // 全部都是有组合工具id，直接提交请求
+        this.okCompobDialog();
+      }
+    },
+    closeDialog() {
+      this.$emit('close');
+    },
+    closeCompobDialog() {
+      this.isShowCompobDialog = false;
+    },
+    okCompobDialog() {
+      let flag = 0;
+      this.subDataList && this.subDataList.forEach((item) => {
+        this.$api.inspect.applicationInspect.executeInspect(item).then((res) => {
+          if (res.Status == 'OK') {
+            flag++;
+            if (flag == this.subDataList.length) {
+              this.$Message.success(this.$t('message.executesuccess'));
+              this.isShowCompobDialog = false;
+              this.closeDialog();
+            }
+          }
+        }).catch(() => {
+          this.loadingShow = false;
+        });
+      });
+    },
+    openInspectionTool(typeName) {
+      // 打开巡检定义页面
+      this.typeName = typeName || '';
+      this.isShowInspectTool = true;
+    }
+  },
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang="less" scoped>
+</style>
diff --git a/src/views/pages/inspect/applicationNew/edit-cron-dialog.vue b/src/views/pages/inspect/applicationNew/edit-cron-dialog.vue
new file mode 100644
index 000000000..a7ba7a03b
--- /dev/null
+++ b/src/views/pages/inspect/applicationNew/edit-cron-dialog.vue
@@ -0,0 +1,135 @@
+<template>
+  <TsDialog v-bind="dialogConfig" @on-close="close" @on-ok="save">
+    <template v-slot>
+      <div>
+        <TsForm
+          ref="form"
+          v-model="formData"
+          :item-list="formConfig"
+          type="type"
+          label-position="right"
+        >
+        </TsForm>
+      </div>
+    </template>
+  </TsDialog>
+</template>
+<script>
+import TsForm from '@/resources/plugins/TsForm/TsForm';
+export default {
+  name: '',
+  components: {
+    TsForm
+  },
+  filters: {},
+  props: {
+    scheduleData: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      dialogConfig: {
+        type: 'modal',
+        title: this.$t('term.pbc.cromexpression'),
+        maskClose: false,
+        isShow: true,
+        width: 'medium'
+      },
+      formData: {},
+      formConfig: {
+        appSystemId: {
+          type: 'text',
+          isHidden: true
+        },
+        name: {
+          label: this.$t('page.apply'),
+          type: 'text',
+          disabled: true
+        },
+        isActive: {
+          type: 'radio',
+          label: this.$t('term.report.isactive'),
+          validateList: [
+            {
+              name: 'required',
+              message: this.$t('form.placeholder.pleaseselect', {target: this.$t('page.status')})
+            }
+          ],
+          dataList: [
+            {
+              value: 1,
+              text: this.$t('page.enabled')
+            },
+            {
+              value: 0,
+              text: this.$t('page.disable')
+            }
+          ]
+        },
+        cron: {
+          type: 'quartz',
+          label: this.$t('term.pbc.timeplan'),
+          showType: 'edit',
+          validateList: ['required'],
+          config: {direction: 'down'}
+        },
+        timerange: {
+          label: this.$t('page.startplan') + '/' + this.$t('page.finishplan'),
+          type: 'datetimerange',
+          transfer: true
+        }
+      }
+    };
+  },
+  beforeCreate() {},
+  created() {
+    this.getSchedule();
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    close(needRefresh) {
+      this.$emit('close', needRefresh);
+    },
+    save() {
+      const form = this.$refs.form;
+      if (form && form.valid()) {
+        if (this.formData.timerange && this.formData.timerange.length > 0) {
+          this.formData.beginTime = this.formData.timerange[0];
+          this.formData.endTime = this.formData.timerange[1];
+        }
+        this.$api.inspect.applicationInspect.saveSchedule(this.formData).then(res => {
+          if (res.Status == 'OK') {
+            this.$Message.success(this.$t('message.executesuccess'));
+            this.close(true);
+          }
+        });
+      }
+    },
+    getSchedule() {
+      if (this.scheduleData.id) {
+        this.$api.inspect.applicationInspect.getSchedule(this.scheduleData.id).then(res => {
+          this.formData = res.Return;
+          this.$set(this.formData, 'name', this.scheduleData.appSystemAbbrName + '(' + this.scheduleData.appSystemName + ')');
+          if (this.formData.beginTime && this.formData.endTime) {
+            this.$set(this.formData, 'timerange', [this.formData.beginTime, this.formData.endTime]);
+          }
+        });
+      } else {
+        this.$set(this.formData, 'name', this.scheduleData.appSystemAbbrName + '(' + this.scheduleData.appSystemName + ')');
+        this.$set(this.formData, 'appSystemId', this.scheduleData.appSystemId);
+      }
+    }
+  },
+  computed: {},
+  watch: {}
+};
+</script>
+<style scoped lang="less"></style>
diff --git a/src/views/pages/inspect/applicationNew/inspection-assets-manage.vue b/src/views/pages/inspect/applicationNew/inspection-assets-manage.vue
new file mode 100644
index 000000000..bb7499bd7
--- /dev/null
+++ b/src/views/pages/inspect/applicationNew/inspection-assets-manage.vue
@@ -0,0 +1,458 @@
+<template>
+  <div class="inspection-assets-manage-wrap padding">
+    <Loading :loadingShow="loadingShow" type="fix"></Loading>
+    1
+    <div v-if="envList && envList.length > 0" class="pb-sm li-box">
+      <Row :gutter="16">
+        <Col
+          v-for="item in envList"
+          :key="item.id"
+          :xs="12"
+          :sm="8"
+          :md="6"
+          :lg="4"
+          :xl="3"
+          :xxl="2"
+        >
+          <div
+            v-if="item.name"
+            class="li-item text-action"
+            :class="envId == item.id ? 'li-active li-text border-primary' : 'border-base bg-op'"
+            @click="selectedEnv(item.name)"
+          >{{ item.name }}</div>
+        </Col>
+      </Row>
+    </div>
+    <div v-if="tableList && tableList.length > 0 ">
+      <div v-for="(item, index) in tableList" :key="index">
+        <div class="h3 padding-sm">{{ item.viewLabel }}</div>
+        <TsTable
+          v-bind="filterTypeFields(item)"
+          @changeCurrent="(currentPage) => changeCurrent(currentPage, item, index)"
+          @changePageSize="(pageSize) => changePageSize(pageSize,item, index)"
+        >
+          <template v-slot:ip="{ row }">
+            <span class="text-href" @click.stop="gotoDetails(row)">
+              <span>{{ row.ip.ip }}</span>
+              <span v-if="row.ip.port">:{{ row.ip.port }}</span>
+            </span>
+          </template>
+          <template v-slot:allIpList="{ row }">
+            <div v-if="!$utils.isEmpty(row.allIpList)">
+              <Tag
+                v-for="(v, vindex) in row.allIpList"
+                :key="vindex"
+                class="cursor-pointer"
+                @click.native="toCientityView(v)"
+              >
+                {{ v.name }}
+              </Tag>
+            </div>
+            <div v-else></div>
+          </template>
+          <template v-slot:lcu="{row}">
+            <UserCard v-bind="row.lcu" :hideAvatar="true"></UserCard>
+          </template>
+          <template v-slot:lcd="{ row }">
+            <div v-if="row.lcd">{{ row.lcd | formatDate }}</div>
+          </template>
+          <template v-slot:fcu="{ row }">
+            <UserCard v-bind="row.fcu" :hideAvatar="true"></UserCard>
+          </template>
+          <template v-slot:fcd="{ row }">
+            <div v-if="row.fcd">{{ row.fcd | formatDate }}</div>
+          </template>
+          <template v-slot:monitor="{ row }">
+            <!-- 监控状态 -->
+            <span v-if="row.monitor && row.monitor.time" :title="row.monitor.time | formatDate">
+              <span :class="[row.monitor.cssClass, {'background-FATAL': row.monitor.value== 'FATAL'}]" class="vertical">{{ row.monitor.text }} </span>
+              <span class="text-title">
+                {{ handleTimes(row.monitor.time) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
+              </span>
+            </span>
+            <span v-else></span>
+          </template>
+          <template v-slot:inspect="{ row }">
+            <!-- 巡检状态 -->
+            <span v-if="row.inspect && row.inspect.time" :title="row.inspect.time | formatDate">
+              <span :class="[row.inspect.cssClass, {'background-FATAL': row.inspect.value== 'FATAL'}]" class="vertical cursor" @click="toInspectStatusDetail(row)">{{ row.inspect.text }} </span>
+              <span class="text-title">
+                {{ handleTimes(row.inspect.time) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
+              </span>
+            </span>
+            <span v-else>
+              <span>-</span>
+            </span>
+          </template>
+          <template v-slot:taskStatus="{ row }">
+            <CommonStatus
+              v-if="row.taskStatus"
+              :statusName="row.taskStatus.text"
+              :statusValue="row.taskStatus.value"
+              type="text"
+            ></CommonStatus>
+            <span v-else>-</span>
+          </template>
+          <template v-slot:vendor="{ row }">
+            <Tag
+              v-if="!$utils.isEmpty(row.vendor)"
+              class="cursor-pointer"
+              @click.native="toCientityView(row.vendor)"
+            >
+              {{ row.vendor.name }}
+            </Tag>
+            <span v-else></span>
+          </template>
+          <template v-slot:appModule="{ row }">
+            <div v-if="!$utils.isEmpty(row.appModule)" class="text-href" @click="toCientityView(row.appModule)">
+              <span :class="row.appModule.ciIcon"></span>
+              <span>{{ row.appModule.name }}</span>
+            </div>
+          </template>
+          <template v-slot:appEnvironment="{ row }">
+            <Tag
+              v-if="!$utils.isEmpty(row.appEnvironment)"
+              class="cursor-pointer"
+              @click.native="toGlobalAttrManage()"
+            >
+              {{ row.appEnvironment.value }}
+            </Tag>
+          </template>
+          <template v-slot:appSystem="{row}">
+            <!-- 应用系统 -->
+            <div v-if="!$utils.isEmpty(row.appSystem)" class="text-href" @click="toCientityView(row.appSystem)">
+              <span :class="row.appSystem.ciIcon"></span>
+              <span>{{ row.appSystem.name }}</span>
+            </div>
+          </template>
+          <template v-slot:ownerList="{ row }">
+            <div v-if="!$utils.isEmpty(row.ownerList)">
+              <Tag
+                v-for="(o, oindex) in row.ownerList"
+                :key="oindex"
+                class="cursor-pointer"
+                @click.native="toCientityView(o);"
+              >
+                {{ o.name }}
+              </Tag>
+            </div>
+            <div v-else></div>
+          </template>
+          <template v-slot:businessGroupList="{ row }">
+            <div v-if="!$utils.isEmpty(row.businessGroupList)">
+              <Tag
+                v-for="(b, bindex) in row.businessGroupList"
+                :key="bindex"
+                class="cursor-pointer"
+                @click.native="toCientityView(b)"
+              >
+                {{ b.name }}
+              </Tag>
+            </div>
+            <div v-else></div>
+          </template>
+          <template v-slot:state="{row}">
+            <!-- 资产状态 -->
+            <Tag
+              v-if="!$utils.isEmpty(row.state)"
+              class="cursor-pointer"
+              @click.native="toCientityView(row.state)"
+            >
+              {{ row.state.name }}
+            </Tag>
+          </template>
+          <template v-slot:dataCenter="{ row }">
+            <!-- 数据中心 -->
+            <Tag
+              v-if="!$utils.isEmpty(row.dataCenter)"
+              class="cursor-pointer"
+              @click.native="toCientityView(row.dataCenter)"
+            >
+              {{ row.dataCenter.name }}
+            </Tag>
+            <span v-else></span>
+          </template>
+          <template v-slot:ci="{row}">
+            <!-- 模型 -->
+            <div v-if="!$utils.isEmpty(row.ci)" class="text-href" @click="toCiView(row.ci)">
+              <span :class="row.ci.icon"></span>
+              <span>{{ row.ci.label }}</span>
+            </div>
+          </template>
+          <template v-slot:action="{row}">
+            <div class="tstable-action">
+              <ul class="tstable-action-ul">
+                <li v-if="row && row.jobPhaseNodeVo && row.jobPhaseNodeVo.jobId" class="tsfont-history" @click="toJobDetail(row)">{{ $t('term.inspect.jobdetail') }}</li>
+                <li v-auth="'INSPECT_EXECUTE'" class="tsfont-inspection" @click="doInspection(row)">{{ $t('term.inspect.inspect') }}</li>
+                <li class="tsfont-setting" @click="openRuleThresholdDialog(row)">{{ $t('term.inspect.thresholdrule') }}</li>
+              </ul>
+            </div>
+          </template>
+        </TsTable>
+      </div>
+    </div>
+    <NoData v-else></NoData>
+    <InspectionDialog
+      v-if="isShowInspectionDialog"
+      :ciEntityData="currentCiEntity"
+      @close="closeInspectionDialog"
+    ></InspectionDialog>
+    <RuleOfThresholdDialog
+      v-if="isShowRuleThresholdDialog"
+      :appSystemId="appSystemId"
+      :resourceId="resourceId"
+      @close="closeRuleOfThresholdDialog"
+    ></RuleOfThresholdDialog>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    UserCard: () => import('@/resources/components/UserCard/UserCard.vue'),
+    TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
+    InspectionDialog: () => import('../assetsInspect/inspection-dialog.vue'), // 单个巡检
+    RuleOfThresholdDialog: () => import('./threshold/rule-of-threshold-dialog.vue'), //阈值规则
+    CommonStatus: () => import('@/resources/components/Status/CommonStatus.vue')
+    
+  },
+  filters: {},
+  props: {
+    appSystemId: {
+      type: Number,
+      default: null
+    },
+    appModuleId: {
+      type: Number,
+      default: null
+    },
+    moduleName: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      loadingShow: false,
+      isShowInspectionDialog: false,
+      isShowRuleThresholdDialog: false,
+      envId: '',
+      resourceId: null,
+      currentCiEntity: null,
+      envList: [],
+      tableList: [],
+      tableData: {
+        tbodyList: [],
+        rowNum: 0,
+        pageSize: 20,
+        currentPage: 1
+      }
+      // theadList: [
+      //   { key: 'ip', title: this.$t('page.ipaddress')},
+      //   { key: 'name', title: this.$t('page.name')},
+      //   { key: 'monitorStatus', title: this.$t('term.inspect.monitoringstate')},
+      //   { key: 'inspectStatus', title: this.$t('term.autoexec.inspectstatus')},
+      //   { key: 'stateName', title: this.$t('term.autoexec.assetstatus')},
+      //   { key: 'envName', title: this.$t('term.inspect.envname')},
+      //   { key: 'clusterName', title: this.$t('term.inspect.clustername')},
+      //   { key: 'dataCenterName', title: this.$t('term.inspect.datacenter')},
+      //   { key: 'networkArea', title: this.$t('page.networkarea')},
+      //   { key: 'ownerList', title: this.$t('page.owner')},
+      //   { key: 'bgList', title: this.$t('term.autoexec.subordinatedepartment')},
+      //   { key: 'maintenanceWindow', title: this.$t('term.deploy.maintenancewindow')},
+      //   { key: 'action'}
+      // ]
+    };
+  },
+  beforeCreate() {},
+  async created() {
+    await this.initData();
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    toJobDetail(row) {
+      // 打开新的作业详情
+      if (row && row.jobPhaseNodeVo) {
+        window.open(HOME + '/inspect.html#/job-detail?id=' + row.jobPhaseNodeVo.jobId + '&status=' + row.jobPhaseNodeVo.status, '_blank');
+       
+        // this.$router.push({path: '/job-detail?id=' + row.jobPhaseNodeVo.jobId + '&status=' + row.jobPhaseNodeVo.status});
+      }
+    },
+    doInspection(row) {
+      // 巡检
+      this.isShowInspectionDialog = true;
+      if (row) {
+        this.currentCiEntity = row;
+      }
+    },
+    closeInspectionDialog() {
+      this.isShowInspectionDialog = false;
+      this.currentCiEntity = null;
+    },
+    restoreHistory(historyData) {
+      this.envId = historyData['envId'];
+    },
+    filterTypeFields(row) {
+      // 过滤类型字段，修复控制台报错问题
+      let currentRow = this.$utils.deepClone(row);
+      if (currentRow && currentRow.hasOwnProperty('type')) {
+        delete currentRow.type;
+      }
+      if (currentRow && currentRow.hasOwnProperty('theadList')) {
+        currentRow.theadList.push({
+          title: '',
+          key: 'action'
+        });
+      }
+      return currentRow;
+    },
+    changeCurrent(currentPage, item, index) {
+      this.tableData.currentPage = currentPage;
+      this.getTableData(item, index);
+    },
+    changePageSize(pageSize, item, index) {
+      this.tableData.pageSize = pageSize;
+      this.tableData.currentPage = 1;
+      this.getTableData(item, index);
+    },
+    async initData() {
+      this.tableData.currentPage = 1;
+      await this.getEnvList();
+      await this.getTableData();
+    },
+    async getEnvList() {
+      this.loadingShow = true;
+      await this.$api.cmdb.applicationManage.getEnvironmenteList().then(res => {
+        if (res.Status == 'OK') {
+          this.envList = res.Return?.tbodyList || [];
+          this.envList.unshift({
+            name: this.$t('term.inspect.allenv'),
+            id: ''
+          });
+          this.envList.push({
+            name: this.$t('term.inspect.noconfigenv'),
+            id: -2
+          });
+          this.envId = this.envId || '';
+        }
+      }).finally(() => {
+        this.loadingShow = false;
+      });
+    },
+    getTableData(row, index) {
+      let currentRow = {};
+      let params = {
+        appSystemId: this.appSystemId,
+        appModuleId: this.appModuleId,
+        envId: this.envId,
+        typeId: row && row.type ? row.type.id : null,
+        currentPage: this.tableData.currentPage,
+        pageSize: this.tableData.pageSize
+      };
+      this.$addHistoryData('envId', this.envId);
+      if (this.$utils.isEmpty(this.appSystemId) && this.$utils.isEmpty(this.appModuleId)) {
+        this.tableList = [];
+        return false;
+      }
+      this.loadingShow = true;
+      this.$api.inspect.applicationInspect.getNewapplicationInspectList(params).then(res => {
+        if (res.Status == 'OK') {
+          if (row && !this.$utils.isEmptyObj(row)) {
+            // 内嵌列表翻页
+            let tableList = (res.Return && res.Return.tableList) ? res.Return.tableList[0] : [];
+            currentRow = Object.assign({}, row, tableList);
+            this.$set(this.tableList, index, currentRow);
+          } else {
+            this.tableList = res.Return.tableList;
+          }
+        }
+      }).finally(() => {
+        this.loadingShow = false;
+      });
+    },
+    toCientityView(row) {
+      // 应用清单详情
+      if (row && !this.$utils.isEmptyObj(row)) {
+        window.open(HOME + '/inspect.html#/ci/' + row.ciId + '/cientity-view/' + row.id, '_blank');
+      
+        // this.$router.push({ path: './ci/' + row.typeId + '/cientity-view/' + row.id });
+      }
+    },
+    toInspectStatusDetail(row) {
+      // 巡检状态详情
+      if (row && !this.$utils.isEmptyObj(row)) {
+        window.open(HOME + '/inspect.html#/assets-detail-' + row.id, '_blank');
+      }
+    },
+    gotoDetails(row) {
+      window.open(HOME + '/inspect.html#/assets-detail-' + row.id, '_blank');
+    },
+    toGlobalAttrManage() {
+      //全局属性管理
+      window.open(HOME + '/cmdb.html#/global-attr-manage', '_blank');
+    },
+    toCiView(ci) {
+      if (ci && !this.$utils.isEmptyObj(ci)) {
+        window.open(HOME + '/cmdb.html#/ci-view/' + ci.id, '_blank');
+      }
+    },
+    selectedEnv(name) {
+      let envId = null;
+      this.envList.forEach(v => {
+        if (v.name == name) {
+          envId = v.id;
+        }
+      });
+      this.envId = envId;
+      this.tableData.currentPage = 1;
+      this.getTableData();
+    },
+    handleTimes(time) {
+      let data = '-';
+      if (time) {
+        data = Date.parse(new Date()) - time;
+      }
+      return data;
+    },
+    openRuleThresholdDialog(row) {
+      if (row && row.id) {
+        this.resourceId = row.id;
+        this.isShowRuleThresholdDialog = true;
+      }
+    },
+    closeRuleOfThresholdDialog() {
+      this.isShowRuleThresholdDialog = false;
+    }
+  },
+  computed: {},
+  watch: {
+    appSystemId() {
+      this.initData();
+    },
+    appModuleId() {
+      this.initData();
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+.inspection-assets-manage-wrap {
+  .li-box {
+    margin-bottom: -10px;
+  .li-item {
+    padding: 6px 16px;
+    border-radius: 4px;
+    text-align: center;
+    margin-bottom: 10px;
+  }
+ }
+}
+
+</style>
diff --git a/src/views/pages/inspect/applicationNew/inspection-schedule-dialog.vue b/src/views/pages/inspect/applicationNew/inspection-schedule-dialog.vue
new file mode 100644
index 000000000..daee0f6b1
--- /dev/null
+++ b/src/views/pages/inspect/applicationNew/inspection-schedule-dialog.vue
@@ -0,0 +1,278 @@
+<template>
+  <div>
+    <TsDialog v-bind="dialogConfig" @on-close="close">
+      <template v-slot>
+        <div class="editForm input-border">
+          <div>
+            <Row class="mb-md">
+              <Col span="12"></Col>
+              <Col span="12">
+                <InputSearcher v-model="searchParam.keyword" @change="changeKeyword"></InputSearcher>
+              </Col>
+            </Row>
+          </div>
+          <TsTable
+            v-bind="tableData"
+            :theadList="theadList"
+            @changeCurrent="getScheduleList"
+            @changePageSize="changePageSize"
+          >
+            <template v-slot:isActive="{ row }">
+              <span v-if="row.isActive == 1" class="text-success">{{ $t('page.isactived') }}</span>
+              <span v-if="row.isActive == 0" class="text-grey">{{ $t('page.ban') }}</span>
+            </template>
+            <template v-slot:appSystem="{ row }">
+              <span class="text-href" @click="openCronDialog(row)">{{ row.appSystemAbbrName }} ({{ row.appSystemName }})</span>
+            </template>
+            <template v-slot:execCount="{ row }">
+              <span v-if="row.execCount > 0" class="text-href" @click="openJobListDialog(row)">{{ row.execCount }}</span>
+              <span v-else></span>
+            </template>
+            <template v-slot:cron="{ row }">
+              <div>
+                <TsQuartz v-if="row.cron" :value="row.cron" showType="read"></TsQuartz>
+              </div>
+            </template>
+            <template v-slot:lcuVo="{ row }">
+              <span v-if="row.id">
+                <UserCard :initType="row.lcuVo.initType" :uuid="row.lcuVo.uuid" hideAvatar></UserCard>
+              </span>
+              <span v-else></span>
+            </template>
+            <template slot="jobStatus" slot-scope="{ row }">
+              <div v-if="!$utils.isEmpty(row.jobStatus)">
+                <div>
+                  <span class="text-grey">{{ $t('term.inspect.exeount') }}：</span>
+                  <span>{{ row.jobStatus.execCount || '0' }}{{ $t('page.times') }}</span>
+                </div>
+                <div v-if="row.jobStatus.beginTime != null">
+                  <span class="text-grey">{{ $t('term.autoexec.planstarttime') }}：</span>
+                  <span>{{ row.jobStatus.beginTime | formatDate }}</span>
+                </div>
+                <div v-if="row.jobStatus.endTime != null">
+                  <span class="text-grey">{{ $t('term.autoexec.planendtime') }}：</span>
+                  <span>{{ row.jobStatus.endTime | formatDate }}</span>
+                </div>
+                <div v-if="row.jobStatus.lastFireTime != null">
+                  <span class="text-grey">{{ $t('term.autoexec.lastactivetime') }}：</span>
+                  <span>{{ row.jobStatus.lastFireTime | formatDate }}</span>
+                </div>
+                <div v-if="row.jobStatus.lastFinishTime != null">
+                  <span class="text-grey">{{ $t('term.autoexec.lastcompletetime') }}：</span>
+                  <span>{{ row.jobStatus.lastFinishTime | formatDate }}</span>
+                </div>
+                <div v-if="row.jobStatus.nextFireTime != null">
+                  <span class="text-grey">{{ $t('page.nextactivationtime') }}：</span>
+                  <span>{{ row.jobStatus.nextFireTime | formatDate }}</span>
+                </div>
+              </div>
+            </template>
+            <template v-slot:action="{ row }">
+              <div v-if="row.id" class="tstable-action">
+                <ul class="tstable-action-ul">
+                  <li>
+                    <TsFormSwitch
+                      v-model="row.isActive"
+                      :true-value="1"
+                      :false-value="0"
+                      showStatus
+                      :trueText="$t('page.disable')"
+                      :falseText="$t('page.enable')"
+                      @on-change="toggleActive(row)"
+                    ></TsFormSwitch>
+                  </li>
+                  <li
+                    v-if="row.execCount > 0"
+                    class="tsfont-putongjigui"
+                    @click="showAudit(row.id)"
+                  >
+                    <!-- 执行记录 -->
+                    {{ $t('term.autoexec.executionrecord') }}
+                  </li>
+                </ul>
+              </div>
+            </template>
+          </TsTable>
+        </div>
+      </template>
+    </TsDialog>
+    <EditCronDialog
+      v-if="isCronDialogShow"
+      :scheduleData="currentRowData"
+      @close="closeCronDialog"
+    ></EditCronDialog>
+    <JobListDialog
+      v-if="isJobListDialogShow"
+      :id="currentId"
+      @close="closeJobListDialog"
+    ></JobListDialog>
+    <JobAudit v-if="isAuditShow" :jobUuid="currentJobUuid" @close="closeAuditDialog"></JobAudit>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    UserCard: () => import('@/resources/components/UserCard/UserCard.vue'),
+    TsQuartz: () => import('@/resources/plugins/TsQuartz/TsQuartz.vue'),
+    TsFormSwitch: () => import('@/resources/plugins/TsForm/TsFormSwitch'),
+    InputSearcher: () => import('@/resources/components/InputSearcher/InputSearcher.vue'),
+    TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
+    EditCronDialog: () => import('./edit-cron-dialog.vue'),
+    JobListDialog: () => import('./job-list-dialog.vue'),
+    JobAudit: () => import('../../framework/schedule/job-audit-dialog.vue')
+  },
+  filters: {},
+  props: {
+    id: Number
+  },
+  data() {
+    return {
+      dialogConfig: {
+        type: 'slider',
+        hasFooter: false,
+        title: this.$t('term.inspect.scheduleinspect'),
+        maskClose: true,
+        isShow: true,
+        width: '80%'
+      },
+      currentId: null,
+      currentJobUuid: null,
+      isAuditShow: false, // 定时任务记录
+      searchParam: {
+        keyword: '',
+        currentPage: 1,
+        pageSize: 20
+      },
+      tableData: {},
+      tbodyList: [],
+      theadList: [
+        {
+          title: this.$t('page.apply'),
+          key: 'appSystem'
+        },
+        {
+          title: this.$t('page.status'),
+          key: 'isActive'
+        },
+        {
+          title: this.$t('term.pbc.timeplan'),
+          key: 'cron',
+          width: 200
+        },
+        {
+          title: this.$t('term.autoexec.executionrecord'),
+          key: 'execCount'
+        },
+        {
+          title: this.$t('page.fcu'),
+          key: 'lcuVo'
+        },
+        {
+          title: this.$t('page.fcd'),
+          key: 'lcd',
+          type: 'time'
+        },
+        { key: 'jobStatus', title: this.$t('term.autoexec.executionsituation') },
+        {
+          key: 'action',
+          title: '',
+          type: 'action'
+        }
+      ],
+      isCronDialogShow: false,
+      isJobListDialogShow: false,
+      currentRowData: null
+    };
+  },
+  beforeCreate() {},
+  async created() {
+    if (this.id) {
+      this.searchParam.defaultValue = [this.id];
+    }
+    await this.getScheduleList(1);
+    if (this.id) {
+      let tbodyList = this.tableData?.tbodyList;
+      if (tbodyList && tbodyList.length > 0) {
+        let row = null;
+        tbodyList.forEach(tbody => {
+          if (tbody.id == this.id) {
+            row = tbody;
+          }
+        });
+        this.openCronDialog(row);
+      }
+    }
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    close(needRefresh) {
+      this.$emit('close', needRefresh);
+    },
+    openCronDialog(row) {
+      this.isCronDialogShow = true;
+      this.currentRowData = row;
+    },
+    closeCronDialog(needRefresh) {
+      this.isCronDialogShow = false;
+      this.currentRowData = null;
+      if (needRefresh) {
+        this.getScheduleList();
+      }
+    },
+    async getScheduleList(currentPage) {
+      if (currentPage) {
+        this.searchParam.currentPage = currentPage;
+      }
+      await this.$api.inspect.applicationInspect.searchSchedule(this.searchParam).then(res => {
+        this.tableData = res.Return;
+      });
+    },
+    changePageSize(pageSize) {
+      this.searchParam.pageSize = pageSize;
+      this.getScheduleList(1);
+    },
+    changeKeyword(keyword) {
+      this.searchParam.keyword = keyword;
+      this.getScheduleList(1);
+    },
+    toggleActive(row) {
+      const param = {
+        id: row.id,
+        isActive: row.isActive
+      };
+      this.$api.inspect.applicationInspect.updateStatus(param).then(res => {
+        if (res.Status == 'OK') {
+          this.$Message.success(this.$t('message.executesuccess'));
+          this.getScheduleList();
+        }
+      });
+    },
+    openJobListDialog(row) {
+      this.currentId = row.id;
+      this.isJobListDialogShow = true;
+    },
+    closeJobListDialog() {
+      this.currentId = null;
+      this.isJobListDialogShow = false;
+    }, showAudit(jobUuid) {
+      this.isAuditShow = true;
+      this.currentJobUuid = '' + jobUuid;
+    },
+    closeAuditDialog() {
+      this.isAuditShow = false;
+      this.currentJobUuid = null;
+    }
+  },
+  computed: {},
+  watch: {}
+};
+</script>
+<style scoped lang="less"></style>
diff --git a/src/views/pages/inspect/applicationNew/job-list-dialog.vue b/src/views/pages/inspect/applicationNew/job-list-dialog.vue
new file mode 100644
index 000000000..aeb22e132
--- /dev/null
+++ b/src/views/pages/inspect/applicationNew/job-list-dialog.vue
@@ -0,0 +1,95 @@
+<template>
+  <div>
+    <TsDialog v-bind="dialogConfig" @on-close="close">
+      <template v-slot>
+        <div>
+          <Row class="mb-md" :gutter="8">
+            <Col span="8"></Col>
+            <Col span="8">
+              <TsFormDatePicker
+                v-model="dateTimeRange"
+                :placeholder="$t('page.plantime')"
+                format="yyyy-MM-dd HH:mm:ss"
+                type="datetimerange"
+                border="border"
+                @on-change="changeDateTimeRange"
+              ></TsFormDatePicker>
+            </Col>
+            <Col span="8">
+              <InputSearcher v-model="searchParam.keyword"></InputSearcher>
+            </Col>
+          </Row>
+        </div>
+        <div>
+          <JobList :params="searchParam"></JobList>
+        </div>
+      </template>
+    </TsDialog>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    TsFormDatePicker: () => import('@/resources/plugins/TsForm/TsFormDatePicker.vue'),
+    InputSearcher: () => import('@/resources/components/InputSearcher/InputSearcher.vue'),
+    JobList: () => import('pages/autoexec/manage/job/job-list.vue')
+  },
+  props: {
+    id: {
+      type: Number
+    }
+  },
+  data() {
+    return {
+      dialogConfig: {
+        type: 'modal',
+        title: this.$t('term.inspect.jobexerecord'),
+        hasFooter: false,
+        maskClose: true,
+        isShow: true,
+        width: 'large'
+      },
+      dateTimeRange: [],
+      searchParam: {
+        scheduleId: this.id,
+        keyword: '',
+        startTime: {},
+        sourceList: ['scheduleinspectapp']
+
+      }
+    };
+  },
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    close() {
+      this.$emit('close');
+    },
+    changeDateTimeRange() {
+      if (this.dateTimeRange instanceof Array) {
+        if (this.dateTimeRange.length > 1) {
+          this.searchParam.startTime = {
+            startTime: this.dateTimeRange[0],
+            endTime: this.dateTimeRange[1]
+          };
+        }
+      } else {
+        this.searchParam.startTime = {};
+      }
+    }
+  },
+  filter: {},
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang="less"></style>
diff --git a/src/views/pages/inspect/applicationNew/latest-questions-manage.vue b/src/views/pages/inspect/applicationNew/latest-questions-manage.vue
new file mode 100644
index 000000000..2df0dd576
--- /dev/null
+++ b/src/views/pages/inspect/applicationNew/latest-questions-manage.vue
@@ -0,0 +1,720 @@
+<template>
+  <div class="latest-question-manage-box padding">
+    2
+    <Loading :loadingShow="loadingShow" type="fix"></Loading>
+    <div class="action-group text-right pb-sm">
+      <span :class="isExpandCollapse ? 'tsfont-up' : 'tsfont-down'" class="action-item" @click="handleExpandCollapseAll()">
+        <span v-if="isExpandCollapse">{{ $t('page.packup') }}</span>
+        <span v-else>{{ $t('page.expand') }}</span>
+      </span>
+      <span class="action-item tsfont-rotate-right" @click="handleRefresh()">{{ $t('page.refresh') }}</span>
+      <span v-if="!downloadLoading" v-download="downloadUrl" class="action-item tsfont-download">{{ $t('page.export') }}</span>
+      <span v-if="downloadLoading" class="action-item disable" :title="$t('page.downloadloadingtip')">
+        <Icon type="ios-loading" size="18" class="loading icon-right"></Icon>
+        {{ $t('page.export') }}
+      </span>
+      <span class="action-item tsfont-mail-unread-o" @click="sendEmail">{{ $t('page.mail') }}</span>
+    </div>
+    <div v-if="envList && envList.length > 0" class="li-box">
+      <Row :gutter="16">
+        <Col
+          v-for="item in envList"
+          :key="item.id"
+          :xs="12"
+          :sm="8"
+          :md="6"
+          :lg="4"
+          :xl="3"
+          :xxl="2"
+        >
+          <div
+            v-if="item.name"
+            class="li-item text-action"
+            :class="envId == item.id ? 'li-active li-text border-primary' : 'border-base bg-op'"
+            @click="selectedEnv(item.name)"
+          >{{ item.name }}</div>
+        </Col>
+      </Row>
+    </div>
+    <div v-if="tableList && tableList.length > 0 ">
+      <div v-for="(item, tIndex) in tableList" :key="tIndex">
+        <div class="h3 padding-sm">{{ item.viewLabel }}</div>
+        <div>
+          <TsTable
+            v-if="!loadingShow"
+            v-bind="filterTypeFields(item)"
+            :fixedHeader="false"
+            keyName="id"
+            canExpand
+            class="inner-table"
+            @changeCurrent="(currentPage) => changeCurrent(currentPage, item, tIndex)"
+            @changePageSize="(pageSize) => changePageSize(pageSize, item, tIndex)"
+          >
+            <template v-slot:ip="{ row }">
+              <span class="text-href" @click.stop="toAssetsDetail(row)">
+                <span>{{ row.ip.ip }}</span>
+                <span v-if="row.ip.port">:{{ row.ip.port }}</span>
+              </span>
+            </template>
+            <template v-slot:allIpList="{ row }">
+              <div v-if="!$utils.isEmpty(row.allIpList)">
+                <Tag
+                  v-for="(v, vindex) in row.allIpList"
+                  :key="vindex"
+                  class="cursor-pointer"
+                  @click.native="toCientityView(v)"
+                >
+                  {{ v.name }}
+                </Tag>
+              </div>
+              <div v-else></div>
+            </template>
+            <template v-slot:monitor="{ row }">
+              <!-- 监控状态 -->
+              <span v-if="row.monitor && row.monitor.time" :title="row.monitor.time | formatDate">
+                <span :class="[row.monitor.cssClass, {'background-FATAL': row.monitor.value== 'FATAL'}]" class="vertical">{{ row.monitor.text }} </span>
+                <span class="text-title">
+                  {{ handleTime(row.monitor.time) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
+                </span>
+              </span>
+              <span v-else>
+                <span>-</span>
+              </span>
+            </template>
+            <template v-slot:taskStatus="{ row }">
+              <CommonStatus
+                v-if="row.taskStatus"
+                :statusName="row.taskStatus.text"
+                :statusValue="row.taskStatus.value"
+                type="text"
+              ></CommonStatus>
+              <span v-else>-</span>
+            </template>
+            <template v-slot:inspect="{ row }">
+              <!-- 巡检状态 -->
+              <span v-if="row.inspect && row.inspect.time" :title="row.inspect.time | formatDate">
+                <span :class="[row.inspect.cssClass, {'background-FATAL': row.inspect.value== 'FATAL'}]" class="vertical cursor" @click="toAssetsDetail(row)">{{ row.inspect.text }} </span>
+                <span class="text-title">
+                  {{ handleTime(row.inspect.time) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
+                </span>
+              </span>
+              <span v-else>
+                <span>-</span>
+              </span>
+            </template>
+            <template v-slot:lcu="{row}">
+              <UserCard v-bind="row.lcu" :hideAvatar="true"></UserCard>
+            </template>
+            <template v-slot:lcd="{ row }">
+              <div v-if="row.lcd">{{ row.lcd | formatDate }}</div>
+            </template>
+            <template v-slot:fcu="{ row }">
+              <UserCard v-bind="row.fcu" :hideAvatar="true"></UserCard>
+            </template>
+            <template v-slot:fcd="{ row }">
+              <div v-if="row.fcd">{{ row.fcd | formatDate }}</div>
+            </template>
+            
+            <template v-slot:vendor="{ row }">
+              <!-- 厂商 -->
+              <Tag
+                v-if="!$utils.isEmpty(row.vendor)"
+                class="cursor-pointer"
+                @click.native="toCientityView(row.vendor)"
+              >
+                {{ row.vendor.name }}
+              </Tag>
+              <span v-else></span>
+            </template>
+            <template v-slot:appSystem="{row}">
+              <!-- 应用系统 -->
+              <div v-if="!$utils.isEmpty(row.appSystem)" class="text-href" @click="toCientityView(row.appSystem)">
+                <span :class="row.appSystem.ciIcon"></span>
+                <span>{{ row.appSystem.name }}</span>
+              </div>
+            </template>
+            <template v-slot:appModule="{ row }">
+              <!-- 应用模块 -->
+              <div v-if="!$utils.isEmpty(row.appModule)" class="text-href" @click="toCientityView(row.appModule)">
+                <span :class="row.appModule.ciIcon"></span>
+                <span>{{ row.appModule.name }}</span>
+              </div>
+            </template>
+            <template v-slot:appEnvironment="{ row }">
+              <!-- 环境 -->
+              <Tag
+                v-if="!$utils.isEmpty(row.appEnvironment)"
+                class="cursor-pointer"
+                @click.native="toGlobalAttrManage()"
+              >
+                {{ row.appEnvironment.value }}
+              </Tag>
+            </template>
+            <template v-slot:state="{row}">
+              <!-- 资产状态 -->
+              <Tag
+                v-if="!$utils.isEmpty(row.state)"
+                class="cursor-pointer"
+                @click.native="toCientityView(row.state)"
+              >
+                {{ row.state.name }}
+              </Tag>
+            </template>
+            <template v-slot:ownerList="{ row }">
+              <div v-if="!$utils.isEmpty(row.ownerList)">
+                <Tag
+                  v-for="(o, oindex) in row.ownerList"
+                  :key="oindex"
+                  class="cursor-pointer"
+                  @click.native="toCientityView(o);"
+                >
+                  {{ o.name }}
+                </Tag>
+              </div>
+              <div v-else></div>
+            </template>
+            <template v-slot:businessGroupList="{ row }">
+              <div v-if="!$utils.isEmpty(row.businessGroupList)">
+                <Tag
+                  v-for="(b, bindex) in row.businessGroupList"
+                  :key="bindex"
+                  class="cursor-pointer"
+                  @click.native="toCientityView(b)"
+                >
+                  {{ b.name }}
+                </Tag>
+              </div>
+              <div v-else></div>
+            </template>
+            <template v-slot:ci="{row}">
+              <!-- 模型 -->
+              <div v-if="!$utils.isEmpty(row.ci)" class="text-href" @click="toCiView(row.ci)">
+                <span :class="row.ci.icon"></span>
+                <span>{{ row.ci.label }}</span>
+              </div>
+            </template>
+            <template v-slot:dataCenter="{ row }">
+              <!-- 数据中心 -->
+              <Tag
+                v-if="!$utils.isEmpty(row.dataCenter)"
+                class="cursor-pointer"
+                @click.native="toCientityView(row.dataCenter)"
+              >
+                {{ row.dataCenter.name }}
+              </Tag>
+              <span v-else></span>
+            </template>
+            <template v-slot:expandCollapseArrow="{ row ,index}">
+              <span :class="{ 'tsfont-right': !row._expand, 'tsfont-down open': row._expand }" class="table-icon" @click.stop="openInnerTable(row, tIndex, index)"></span>
+            </template>
+            <template v-slot:expand="{ row }">
+              <ExpandTable v-if="row._expand" style="margin-left: 40px;" :inspectResultList="getInnerTbodyList(row.inspectResult)"></ExpandTable>
+            </template>
+            <template v-slot:action="{ row }">
+              <div class="tstable-action">
+                <ul class="tstable-action-ul">
+                  <li class="tsfont-setting" @click="openRuleThresholdDialog(row)">{{ $t('term.inspect.thresholdrule') }}</li>
+                  <li v-if="row && row.jobPhaseNodeVo && row.jobPhaseNodeVo.jobId" class="tsfont-history" @click="toJobDetail(row)">{{ $t('term.inspect.jobdetail') }}</li>
+                  <li v-if="row.ip" class="tsfont-ci" @click="toCientityView(row.ip)">{{ $t('term.cmdb.viewcientity') }}</li>
+                </ul>
+              </div>
+            </template>
+          </TsTable>
+        </div>
+      </div>
+    </div>
+    <NoData v-else></NoData>
+    <SendEmail
+      v-if="isShowSendEmail"
+      :params="{
+        isNeedAlertDetail: 1,
+        appSystemId: appSystemId,
+        inspectStatusList: inspectStatusList
+      }"
+      @closeSendEmailDialog="closeSendEmailDialog"
+    ></SendEmail>
+    <RuleOfThresholdDialog
+      v-if="isShowRuleThresholdDialog"
+      :appSystemId="appSystemId"
+      :resourceId="resourceId"
+      @close="closeRuleOfThresholdDialog"
+    ></RuleOfThresholdDialog>
+  </div>
+</template>
+<script>
+import download from '@/resources/directives/download.js';
+export default {
+  name: '',
+  components: {
+    UserCard: () => import('@/resources/components/UserCard/UserCard.vue'),
+    TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
+    CommonStatus: () => import('@/resources/components/Status/CommonStatus.vue'),
+    ExpandTable: () => import('@/views/pages/inspect/recentIssues/component/expand-table.vue'),
+    SendEmail: () => import('@/views/pages/inspect/recentIssues/component/send-email.vue'),
+    RuleOfThresholdDialog: () => import('./threshold/rule-of-threshold-dialog.vue')
+  },
+  directives: { download },
+  props: {
+    appSystemId: {
+      // 应用Id
+      type: Number,
+      default: null
+    },
+    appModuleId: {
+      // 模块Id
+      type: Number,
+      default: null
+    }
+  },
+  data() {
+    return {
+      loadingShow: true,
+      isExpandCollapse: true, // 处理展开收起，默认展开
+      isShowSendEmail: false,
+      downloadLoading: false,
+      isShowRuleThresholdDialog: false,
+      typeName: '',
+      envId: null, // 环境ID
+      envList: [], // 环境列表
+      expandCollapseIdList: [], // 展开收起Id列表，下榻页面，返回显示用
+      isBack: false,
+      tableList: [],
+      tableConfig: {
+        tbodyList: [],
+        pageSize: 20,
+        currentPage: 1,
+        rowNum: null
+      }
+      // theadList: [
+      //   {
+      //     title: '',
+      //     key: 'expandCollapseArrow' // 展开收起箭头
+      //   },
+      //   {
+      //     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: this.$t('term.inspect.inspectionjobstatus'),
+      //     key: 'taskStatus'
+      //   },
+      //   {
+      //     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: '',
+      //     key: 'action'
+      //   }
+      // ]
+    };
+  },
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {
+    this.initData();
+  },
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    async initData() {
+      this.tableConfig.currentPage = 1;
+      await this.getEnvList();
+      await this.getInspectStatusList();
+      await this.getTableData();
+    },
+    async getEnvList() {
+      await this.$api.cmdb.applicationManage.getEnvironmenteList().then(res => {
+        if (res.Status == 'OK') {
+          this.envList = res.Return?.tbodyList || [];
+          this.envList.unshift({
+            name: this.$t('term.inspect.allenv'),
+            id: ''
+          });
+          this.envList.push({
+            name: this.$t('term.inspect.noconfigenv'),
+            id: -2
+          });
+          this.envId = this.envId || ''; // 有环境id，就取环境ID的值，否则默认选择所有环境（用于下榻页面返回）
+        }
+      });
+    },
+    async getInspectStatusList() {
+      // 获取巡检状态列表
+      this.inspectStatusList = [];
+      await this.$api.common.getSelectList({enumClass: 'InspectStatus'}).then((res) => {
+        if (res.Status == 'OK') {
+          let nodeList = res.Return || [];
+          if (nodeList && nodeList.length > 0) {
+            nodeList.forEach(item => {
+              if (item && item.value != 'normal') {
+                this.inspectStatusList.push(item.value);
+              }
+            });
+          }
+        }
+      });
+    },
+    getTableData(row, index) {
+      //获取表格数据
+      let params = {
+        appSystemId: this.appSystemId,
+        appModuleId: this.appModuleId,
+        envId: this.envId,
+        inspectStatusList: this.inspectStatusList,
+        currentPage: this.tableConfig.currentPage,
+        pageSize: this.tableConfig.pageSize
+      };
+      this.$addHistoryData('isExpandCollapse', this.isExpandCollapse);
+      this.$addHistoryData('expandCollapseIdList', this.expandCollapseIdList);
+      this.$addHistoryData('envId', this.envId);
+      this.loadingShow = true;
+      this.$api.inspect.applicationInspect.getNewapplicationInspectList(params).then(res => {
+        if (res.Status == 'OK') {
+          if (row && !this.$utils.isEmptyObj(row)) {
+            // 内嵌列表翻页
+            let tableList = (res.Return && res.Return.tableList) ? ((res.Return.tableList.length > index) ? res.Return.tableList[index] : res.Return.tableList[0]) : [];
+            let currentRow = Object.assign({}, row, tableList);
+            this.tableConfig.pageSize = tableList ? tableList.pageSize : 20;
+            this.tableConfig.currentPage = tableList ? tableList.currentPage : 1;
+            this.$set(this.tableList, index, currentRow);
+          } else {
+            this.tableList = res.Return ? res.Return.tableList : [];
+            this.tableConfig.pageSize = 20;
+            this.tableConfig.currentPage = 1;
+          }
+          let resourceIdList = [];
+          if (this.tableList && !this.$utils.isEmpty(this.tableList)) {
+            this.tableList.forEach(item => {
+              if (item && item.tbodyList && !this.$utils.isEmpty(item.tbodyList)) {
+                item.tbodyList.forEach((v) => {
+                  if (v && v.id) {
+                    resourceIdList.push(v.id);
+                  }
+                });
+              }
+            });
+          }
+          if (this.$utils.isEmpty(this.expandCollapseIdList) && this.isExpandCollapse) {
+            // 首次需要把id存起来，下榻页面返回需要使用
+            this.expandCollapseIdList = resourceIdList;
+            this.$addHistoryData('expandCollapseIdList', this.expandCollapseIdList);
+          }
+          this.getInnerTableList(resourceIdList); // 获取内嵌表格数据
+        }
+      }).catch(() => {
+        this.loadingShow = false;
+      });
+    },
+    getInnerTableList(resourceIdList) {
+      // 获取内嵌表格数据
+      this.loadingShow = true;
+      if (resourceIdList && !this.$utils.isEmpty(resourceIdList)) {
+        this.$api.inspect.inspectJob.getRecentIssuesInnerTableList({ resourceIdList: resourceIdList }).then(res => {
+          if (res.Status == 'OK') {
+            let obj = res.Return;
+            this.tableList.forEach(item => {
+              if (item && item.tbodyList && !this.$utils.isEmpty(item.tbodyList)) {
+                item.tbodyList.forEach((v) => {
+                  Object.keys(obj).forEach(n => {
+                    if (v.id == n) {
+                      this.$set(v, 'inspectResult', obj[n] ? Object.values(obj[n]) : []);
+                    }
+                  });
+                });
+              }
+            });
+            if (this.tableList && !this.$utils.isEmpty(this.tableList)) {
+              this.tableList.forEach(val => {
+                if (val && val.tbodyList && !this.$utils.isEmpty(val.tbodyList)) {
+                  val.tbodyList.forEach((v) => {
+                    if (v && v.hasOwnProperty('inspectResult') && !this.$utils.isEmpty(v.inspectResult)) {
+                      if (this.isBack) { // 下榻页面返回，恢复之前展开收起状态
+                        v['_expand'] = !this.$utils.isEmpty(this.expandCollapseIdList) ? this.expandCollapseIdList.includes(v.id) : this.isExpandCollapse;
+                      } else {
+                        v['_expand'] = this.isExpandCollapse;
+                      }
+                    }
+                  });
+                }
+              });
+            }
+          }
+        }).finally(() => {
+          this.loadingShow = false;
+        });
+      } else {
+        this.loadingShow = false;
+      }
+    },
+    changeCurrent(currentPage, item, index) {
+      this.tableConfig.currentPage = currentPage;
+      this.getTableData(item, index);
+    },
+    changePageSize(pageSize, item, index) {
+      this.tableConfig.pageSize = pageSize;
+      this.tableConfig.currentPage = 1;
+      this.getTableData(item, index);
+    },
+    restoreHistory(historyData) {
+      // 下榻页面，返回搜索条件保持一致
+      this.isBack = true;
+      this.envId = historyData['envId'];
+      this.expandCollapseIdList = historyData['expandCollapseIdList'];
+      this.isExpandCollapse = historyData['isExpandCollapse'];
+    },
+    selectedEnv(name) {
+      let envId = null;
+      this.envList.forEach(v => {
+        if (v.name == name) {
+          envId = v.id;
+        }
+      });
+      this.envId = envId;
+      this.tableConfig.currentPage = 1;
+      this.getTableData();
+    },
+    filterTypeFields(row) {
+      // 过滤类型字段，修复控制台报错问题
+      let currentRow = this.$utils.deepClone(row);
+      if (currentRow && currentRow.hasOwnProperty('type')) {
+        delete currentRow.type;
+      }
+      if (currentRow && currentRow.hasOwnProperty('theadList')) {
+        currentRow.theadList.unshift({
+          title: '',
+          key: 'expandCollapseArrow' // 展开收起箭头
+        });
+        currentRow.theadList.push({
+          title: '',
+          key: 'action'
+        });
+      }
+      return currentRow;
+    },
+    handleTime(time) {
+      let data = '-';
+      if (time) {
+        data = Date.parse(new Date()) - time;
+      }
+      return data;
+    },
+    handleExpandCollapseAll() {
+      // 处理展开收起所有(内嵌表格)
+      this.isExpandCollapse = !this.isExpandCollapse;
+      let expandCollapseIdList = [];
+      if (this.tableList && !this.$utils.isEmpty(this.tableList)) {
+        this.tableList.forEach(item => {
+          if (item && item.tbodyList && !this.$utils.isEmpty(item.tbodyList)) {
+            item.tbodyList.forEach((v) => {
+              v['_expand'] = this.isExpandCollapse;
+              if (this.isExpandCollapse) {
+                // 展开，需要存储展开的id
+                expandCollapseIdList.push(v.id);
+              } else {
+                expandCollapseIdList = [];
+              }
+            });
+          }
+        });
+      }
+      this.expandCollapseIdList = expandCollapseIdList;
+      this.$addHistoryData('isExpandCollapse', this.isExpandCollapse);
+      this.$addHistoryData('expandCollapseIdList', expandCollapseIdList);
+    },
+    openInnerTable(row, tIndex, rowIndex) {
+      // 展开收起内嵌表格
+      if (row['_expand']) {
+        row._expand = false;
+        this.$set(this.tableList[tIndex]['tbodyList'], rowIndex, row);
+        this.isExpandCollapse = false;
+        this.expandCollapseIdList && this.expandCollapseIdList.forEach((id, index) => {
+          if (id == row.id) {
+            this.expandCollapseIdList.splice(index, 1);
+          }
+        });
+      } else {
+        row._expand = true;
+        this.$set(this.tableList[tIndex]['tbodyList'], rowIndex, row);
+        this.isExpandCollapse = true;
+        if (!this.expandCollapseIdList.includes(row.id)) {
+          // id没有时，才push进去
+          this.expandCollapseIdList.push(row.id);
+        }
+      }
+      this.$addHistoryData('expandCollapseIdList', this.expandCollapseIdList);
+      this.$addHistoryData('isExpandCollapse', this.isExpandCollapse);
+    },
+    getInnerTbodyList(inspectResult) {
+      // 处理内嵌表格数据
+      let tbodyList = [];
+      if (inspectResult && !this.$utils.isEmpty(inspectResult)) {
+        tbodyList = inspectResult;
+      }
+      return tbodyList;
+    },
+    handleRefresh() {
+      // 处理刷新
+      this.tableConfig.currentPage = 1;
+      this.getTableData();
+    },
+    sendEmail() {
+      // 发送邮件
+      this.isShowSendEmail = true;
+    },
+    closeSendEmailDialog() {
+      this.isShowSendEmail = false;
+    },
+    toAssetsDetail(row) {
+      // 跳转巡检报告页面
+      window.open(HOME + '/inspect.html#/assets-detail-' + row.id, '_blank');
+    },
+    toJobDetail(row) {
+      // 工作详情
+      if (row && row.jobPhaseNodeVo) {
+        window.open(HOME + '/inspect.html#/job-detail?id=' + row.jobPhaseNodeVo.jobId + '&status=' + row.jobPhaseNodeVo.status, '_blank');
+       
+        // this.$router.push({path: '/job-detail?id=' + row.jobPhaseNodeVo.jobId + '&status=' + row.jobPhaseNodeVo.status});
+      }
+    },
+    toCientityView(row) {
+      // 跳转查看配置项页面
+      if (row && !this.$utils.isEmptyObj(row)) {
+        window.open(HOME + '/inspect.html#/ci/' + row.ciId + '/cientity-view/' + row.id, '_blank');
+      }
+      // this.$router.push({path: '/ci/' + row.typeId + '/cientity-view/' + row.id});
+    },
+    toCiView(ci) {
+      if (ci && !this.$utils.isEmptyObj(ci)) {
+        window.open(HOME + '/cmdb.html#/ci-view/' + ci.id, '_blank');
+      }
+    },
+    openRuleThresholdDialog(row) {
+      if (row && row.id) {
+        this.resourceId = row.id;
+        this.isShowRuleThresholdDialog = true;
+      }
+    },
+    closeRuleOfThresholdDialog() {
+      this.isShowRuleThresholdDialog = false;
+    }
+  },
+  filter: {},
+  computed: {
+    downloadUrl() {
+      return {
+        url: 'api/binary/inspect/new/problem/report/export',
+        method: 'post',
+        params: {
+          isNeedAlertDetail: 1,
+          appSystemId: this.appSystemId,
+          inspectStatusList: this.inspectStatusList
+        },
+        changeStatus: status => {
+          if (status == 'start') {
+            this.downloadLoading = true;
+          } else if (status == 'success' || status == 'error') {
+            this.downloadLoading = false;
+          }
+        }
+      };
+    }
+  },
+  watch: {
+    appModuleId(id) {
+      if (id) {
+        this.expandCollapseIdList = [];
+        this.isExpandCollapse = true;
+        this.isBack = false;
+        this.initData();
+      }
+    },
+    appSystemId(id) {
+      if (id && this.$utils.isEmpty(this.appModuleId)) {
+        this.expandCollapseIdList = [];
+        this.isExpandCollapse = true;
+        this.isBack = false;
+        this.initData();
+      }
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+.latest-question-manage-box {
+  .li-box {
+    margin-bottom: -10px;
+  .li-item {
+    padding: 6px 16px;
+    border-radius: 4px;
+    text-align: center;
+    margin-bottom: 10px;
+  }
+ }
+ .table-icon {
+  cursor: pointer;
+  font-size: 14px;
+  visibility: hidden;
+  padding: 1px 3px;
+  &.open {
+    visibility: visible;
+  }
+}
+tr:hover {
+  .table-icon {
+    visibility: visible;
+  }
+ }
+}
+</style>
diff --git a/src/views/pages/inspect/applicationNew/threshold/app-threshold-rule-add.vue b/src/views/pages/inspect/applicationNew/threshold/app-threshold-rule-add.vue
new file mode 100644
index 000000000..016f1b71e
--- /dev/null
+++ b/src/views/pages/inspect/applicationNew/threshold/app-threshold-rule-add.vue
@@ -0,0 +1,485 @@
+
+<template>
+  <div class="rule-add-wrap" :style="$utils.isEmpty(ruleList) ? 'margin-top: 2px;' : ''">
+    <ul v-if="!$utils.isEmpty(ruleList)" class="mb-md">
+      <li
+        v-for="(item, index) in ruleList"
+        :id="`to_${item.ruleId}`"
+        :key="item.ruleUuid"
+        class="bg-op radius-lg padding mb-md"
+      >
+        <div class="header-wrapper" :class="item.isShow ? 'pb-sm header-border-bottom border-color' : ''">
+          <span>#{{ item.ruleId }}</span>
+          <div class="action-group">
+            <span
+              v-if="$AuthUtils.hasRole('INSPECT_MODIFY')"
+              class="tsfont-copy text-action action-item"
+              :title="$t('page.copy')"
+              @click="copyRow(item,index)"
+            ></span>
+            <span
+              class="text-action action-item"
+              :class="[item.isShow == true ? 'tsfont-down' : 'tsfont-up']"
+              :title="[item.isShow == true ? $t('page.packup') : $t('page.expand')]"
+              @click="expandCollapse(item, index)"
+            ></span>
+            <span
+              v-if="item.flag == 'app' && $AuthUtils.hasRole('INSPECT_MODIFY')"
+              class="tsfont-close text-action action-item"
+              :title="$t('page.delete')"
+              @click="delRow(item,index)"
+            ></span>
+          </div>
+        </div>
+        <div :class="[item.isShow == true ? 'show-li' : 'hide-li']" class="pt-nm">
+          <TsForm
+            ref="formSetting"
+            v-model="item.formValue"
+            :itemList="item.formSetting"
+            labelPosition="left"
+            :labelWidth="70"
+          ></TsForm>
+        </div>
+      </li>
+    </ul>
+    <Button
+      v-if="$AuthUtils.hasRole('INSPECT_MODIFY')"
+      type="primary"
+      ghost
+      @click.native="addRule"
+    >
+      <span class="text-href tsfont-plus add-text">
+        {{ $t('term.inspect.addrule') }}
+      </span>
+    </Button>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    TsForm: () => import('@/resources/plugins/TsForm/TsForm')
+  },
+  filters: {},
+  props: {
+    // 规则
+    thresholdsData: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      initDataList: [], // 初始值
+      ruleList: [],
+      levelList: [], // 级别下拉数组
+      ruleTooltips: this.$t('term.inspect.ruletooltips')
+    };
+  },
+  beforeCreate() {},
+  created() {
+    this.filterNormalFields(); // 过滤级别正常的字段
+    this.initData();
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    initData() {
+      this.initDataList = [];
+      this.ruleList = [];
+      if (!this.$utils.isEmptyObj(this.thresholdsData) && (!this.$utils.isEmpty(this.thresholdsData.globalThresholds) || !this.$utils.isEmpty(this.thresholdsData.appThresholds))) {
+      // 规则回显问题
+        let thresholdsList = [];
+        let appIndex = 0;
+        let hasAuth = this.$AuthUtils.hasRole('INSPECT_MODIFY');
+        this.thresholdsData && this.thresholdsData.globalThresholds && this.thresholdsData.globalThresholds.length > 0 && this.thresholdsData.globalThresholds.forEach((v, index) => {
+          if (v) {
+            thresholdsList.push({...v, inheritGlobal: 1, flag: 'global', ruleId: (index + 1)});
+          }
+        });
+        this.thresholdsData && this.thresholdsData.appThresholds && this.thresholdsData.appThresholds.length > 0 && this.thresholdsData.appThresholds.forEach((v, index) => {
+          let hasRepeatRuleUuid = thresholdsList.find((u) => u.ruleUuid == v.ruleUuid);
+          if (hasRepeatRuleUuid) {
+          // 应用层，取消继承全局，那么应用层的id和全局阈值规则相同，那么应用层的阈值规则，覆盖全局阈值规则
+            hasRepeatRuleUuid = Object.assign(hasRepeatRuleUuid, {name: v.name, level: v.level, rule: v.rule, inheritGlobal: 0});
+          } else if (v) {
+            appIndex++;
+            thresholdsList.push({...v, inheritGlobal: 0, flag: 'app', ruleId: v && v.ruleUuid ? (appIndex + 5000) : 5001});
+          }
+        });
+        thresholdsList.forEach((v) => {
+          let ruleUuid = v && v.ruleUuid ? v.ruleUuid : this.$utils.setUuid();
+          this.ruleList.push({
+            ruleUuid: ruleUuid,
+            ruleId: v.ruleId,
+            flag: v.flag, // 标识
+            formSetting: [
+              {
+                name: 'inheritGlobal',
+                label: this.$t('term.inspect.inheritglobal'),
+                type: 'switch',
+                value: 1,
+                falseValue: 0,
+                trueValue: 1,
+                readonly: !hasAuth,
+                isHidden: v.flag != 'global', // 继承全局才会显示按钮
+                onChange: (val) => {
+                  if (val == 0) {
+                    this.ruleList.forEach((item) => {
+                      if (item.ruleUuid == ruleUuid) {
+                        this.$set(v, 'inheritGlobal', val);
+                        item.formSetting.forEach((itemV) => {
+                          if (itemV.name != 'inheritGlobal') {
+                            itemV.disabled = false;
+                          }
+                        });
+                      }
+                    });
+                  } else if (val == 1) {
+                  // 继承全局
+                    this.ruleList.forEach((item) => {
+                      if (item.ruleUuid == ruleUuid) {
+                        this.$set(v, 'inheritGlobal', val);
+                        this.$set(item, 'formValue', item.defaultFormValue);
+                        this.$set(item.formValue, 'inheritGlobal', val);
+                        item.formSetting.forEach((itemV) => {
+                          if (itemV.name != 'inheritGlobal') {
+                            itemV.disabled = true;
+                          }
+                        });
+                      }
+                    });
+                  }
+                }
+              },
+              {
+                name: 'name',
+                label: this.$t('page.name'),
+                type: 'text',
+                maxlength: 50,
+                value: '',
+                readonly: !hasAuth,
+                disabled: !!(v.flag == 'global' && v.inheritGlobal), // 继承全局，不可编辑
+                validateList: [
+                  'required',
+                  {
+                    name: 'custom', trigger: 'change', message: this.$t('message.cannotrepeat', {target: this.$t('page.name')}), validator: (rule, value) => {
+                      return this.validNameUnique(value);
+                    }}
+                ]
+              },
+              {
+                name: 'level',
+                label: this.$t('page.level'),
+                type: 'select',
+                readonly: !hasAuth,
+                dataList: this.levelList,
+                disabled: !!(v.flag == 'global' && v.inheritGlobal), // 继承全局，不可编辑
+                validateList: ['required']
+              },
+              {
+                name: 'rule',
+                label: this.$t('page.rule'),
+                type: 'textarea',
+                readonly: !hasAuth,
+                tooltip: this.ruleTooltips,
+                maxlength: 1000,
+                disabled: !!((v.flag == 'global' && v.inheritGlobal)), // 继承全局，不可编辑
+                validateList: ['required']
+              }
+            ],
+            formValue: {
+              name: v.name,
+              level: v.level,
+              rule: v.rule,
+              inheritGlobal: v.inheritGlobal
+            },
+            isShow: true
+          });
+          if (v && ((v.flag == 'global' && v.inheritGlobal == 0) || v.flag == 'app')) {
+            this.initDataList.push({
+              ruleUuid: ruleUuid,
+              name: v.name,
+              level: v.level,
+              rule: v.rule,
+              isOverWrite: v.flag == 'global' && v.inheritGlobal == 0 ? 1 : 0
+            });
+          }
+        });
+        this.ruleList && this.ruleList.forEach((v) => {
+          let hasRuleUuid = this.thresholdsData.globalThresholds.find((item) => item.ruleUuid == v.ruleUuid);
+          if (v && v.flag == 'global' && hasRuleUuid) {
+          // 存储一份全局阈值规则，用于取消继承全局后，拿到全局阈值规则的值
+            v.defaultFormValue = {
+              ...hasRuleUuid
+            };
+          }
+        });
+      } else {
+        this.addRule();
+        this.initDataList.push({
+          name: '',
+          level: '',
+          rule: ''
+        });
+      }
+    },
+    valid() {
+      let formList = this.$refs.formSetting;
+      let isValidPass = true;
+      if (formList) {
+        for (let j = 0; j < formList.length; j++) {
+          if (!formList[j].valid()) {
+            isValidPass = false;
+          }
+        }
+      } else {
+        isValidPass = false;
+      }
+      return isValidPass;
+    },
+    validNameUnique(name) {
+      // 根据名称验证唯一性
+      let repeatNameList = [];
+      let isValidPass = true;
+      if (!this.$utils.isEmpty(this.ruleList)) {
+        repeatNameList = this.ruleList.filter((v) => {
+          // 过滤当前输入的值
+          return v.formValue.name == name && (v.formValue.inheritGlobal != 1);
+        });
+        if (!this.$utils.isEmpty(repeatNameList) && repeatNameList.length >= 2) {
+          isValidPass = false;
+        } else {
+          isValidPass = true;
+        }
+      }
+      return isValidPass;
+    },
+    getGlobalMaxRuleId() {
+      // 获取最大值的规则id
+      let ruleIdList = [];
+      let maxRuleId = null;
+      this.ruleList && this.ruleList.forEach((v) => {
+        if (v && v.flag == 'app' && v.ruleId) {
+          ruleIdList.push(v.ruleId);
+        }
+      });
+      maxRuleId = Math.max.apply(null, ruleIdList);
+      return (maxRuleId != -Infinity || isNaN(maxRuleId)) ? (maxRuleId + 1) : 1;
+    },
+    getFormValue() {
+      // 提供给外部使用
+      let saveFormValue = {isOverWrite: 0, thresholds: []};
+      if (!this.$utils.isEmpty(this.ruleList)) {
+        this.ruleList.forEach((v) => {
+          if (v && v.flag == 'global' && v.formValue.inheritGlobal == 0) {
+            saveFormValue.thresholds.push({
+              ruleUuid: v.ruleUuid,
+              name: v.formValue.name,
+              rule: v.formValue.rule,
+              level: v.formValue.level,
+              isOverWrite: v.formValue.inheritGlobal == 0 ? 1 : 0
+            });
+          } else if (v && v.flag == 'app') {
+            saveFormValue.thresholds.push({
+              ruleUuid: v.ruleUuid,
+              name: v.formValue.name,
+              rule: v.formValue.rule,
+              level: v.formValue.level,
+              isOverWrite: 0
+            });
+          }
+        });
+        let hasOverwrite = saveFormValue.thresholds.find(v => v.isOverWrite == 1);
+        if (hasOverwrite) {
+          saveFormValue.isOverWrite = 1;
+        } else {
+          saveFormValue.isOverWrite = 0;
+        }
+      }
+      return saveFormValue;
+    },
+    getInitData() {
+      return this.initDataList;
+    },
+    addRule() {
+      // 添加规则
+      let hasAuth = this.$AuthUtils.hasRole('INSPECT_MODIFY');
+      this.ruleList.push(
+        {
+          ruleUuid: this.$utils.setUuid(),
+          ruleId: this.getGlobalMaxRuleId(),
+          flag: 'app', // 标识
+          formSetting: [
+            {
+              name: 'name',
+              label: this.$t('page.name'),
+              type: 'text',
+              maxlength: 50,
+              readonly: !hasAuth,
+              validateList: [
+                'required',
+                {
+                  name: 'custom', trigger: 'change', message: this.$t('message.cannotrepeat', {target: this.$t('page.name')}), validator: (rule, value) => {
+                    return this.validNameUnique(value);
+                  }}
+              ]
+            },
+            {
+              name: 'level',
+              label: this.$t('page.level'),
+              type: 'select',
+              readonly: !hasAuth,
+              dataList: this.levelList,
+              validateList: ['required']
+            },
+            {
+              name: 'rule',
+              label: this.$t('page.rule'),
+              type: 'textarea',
+              readonly: !hasAuth,
+              tooltip: this.ruleTooltips,
+              maxlength: 1000,
+              validateList: ['required']
+            }
+          ],
+          formValue: {
+            name: '',
+            level: '',
+            rule: ''
+          },
+          isShow: true
+        }
+      );
+    },
+    delRow(row, index) {
+      if (row && row.formValue) {
+        this.$createDialog({
+          title: this.$t('dialog.title.deleteconfirm'),
+          content: this.$t('dialog.content.deleteconfirm', {target: row.formValue && row.formValue.name ? row.formValue.name : ''}),
+          btnType: 'error',
+          'on-ok': vnode => {
+            this.ruleList.splice(index, 1);
+            this.$Message.success(this.$t('message.deletesuccess'));
+            vnode.isShow = false;
+          }
+        });
+      }
+    },
+    copyRow(item) {
+      let currentRow = this.$utils.deepClone(item);
+      Object.assign(currentRow, {
+        ruleUuid: this.$utils.setUuid(),
+        ruleId: this.getGlobalMaxRuleId(),
+        flag: 'app',
+        formSetting: [
+          {
+            name: 'name',
+            label: this.$t('page.name'),
+            type: 'text',
+            maxlength: 50,
+            validateList: [
+              'required',
+              {
+                name: 'custom', trigger: 'change', message: this.$t('message.cannotrepeat', {target: this.$t('page.name')}), validator: (rule, value) => {
+                  return this.validNameUnique(value);
+                }}
+            ]
+          },
+          {
+            name: 'level',
+            label: this.$t('page.level'),
+            type: 'select',
+            dataList: this.levelList,
+            validateList: ['required']
+          },
+          {
+            name: 'rule',
+            label: this.$t('page.rule'),
+            type: 'textarea',
+            tooltip: this.ruleTooltips,
+            maxlength: 1000,
+            validateList: ['required']
+          }
+        ]
+      });
+      if (currentRow && currentRow.formValue && currentRow.formValue.inheritGlobal) {
+        delete currentRow.formValue.inheritGlobal;
+      }
+      this.ruleList.push(currentRow);
+    },
+    filterNormalFields() {
+      // 过滤级别正常的字段
+      this.$api.common.getSelectList({enumClass: 'neatlogic.framework.common.constvalue.InspectStatus'}).then((res) => {
+        if (res.Status == 'OK' && res.Return) {
+          let levelList = res.Return;
+          for (let i = 0; i < levelList.length; i++) {
+            // 过滤级别"normal"字段，value值转成大写
+            levelList[i].value = levelList[i].value.toUpperCase();
+            if (levelList[i].value != 'NORMAL') {
+              this.levelList.push({
+                ...levelList[i]
+              });
+            }
+          }
+          if (!this.$utils.isEmpty(this.levelList)) {
+            this.ruleList.forEach((v) => {
+              if (v && v.formSetting) {
+                v.formSetting.forEach((itemV) => {
+                  if (itemV.name == 'level') {
+                    this.$set(itemV, 'dataList', this.levelList);
+                    v.formValue.level = v.formValue.level ? v.formValue.level.toUpperCase() : '';
+                  }
+                });
+              }
+            });
+          }
+        }
+      });
+    },
+    expandCollapse(item) {
+      if (item.isShow == false) {
+        this.$set(item, 'isShow', true);
+      } else {
+        this.$set(item, 'isShow', false);
+      }
+    },
+    jumpTo(id) {
+      this.$utils.jumpTo(id);
+    }
+  },
+  computed: {},
+  watch: {
+    thresholdsData: {
+      handler() {
+        this.initData();
+      },
+      deep: true
+    }
+  }
+};
+</script>
+
+<style lang="less" scoped>
+.rule-add-wrap {
+  .show-li {
+    display: block;
+  }
+  .hide-li {
+    display: none;
+  }
+  .header-wrapper {
+    display: flex;
+    justify-content: space-between;
+  }
+  .header-border-bottom {
+    border-bottom: 1px solid;
+  }
+}
+</style>
diff --git a/src/views/pages/inspect/applicationNew/threshold/copy-rule-dialog.vue b/src/views/pages/inspect/applicationNew/threshold/copy-rule-dialog.vue
new file mode 100644
index 000000000..8c1cc2a28
--- /dev/null
+++ b/src/views/pages/inspect/applicationNew/threshold/copy-rule-dialog.vue
@@ -0,0 +1,145 @@
+<template>
+  <div>
+    <TsDialog
+      :title="$t('dialog.title.copytarget', {target: $t('term.inspect.thresholdrule')})"
+      type="slider"
+      width="large"
+      :okText="$t('page.confirm')"
+      :isShow="true"
+      @on-close="closeDialog"
+      @on-ok="okDialog"
+    >
+      <template v-slot>
+        <div>
+          <Loading
+            :loadingShow="loadingShow"
+            type="fix"
+          ></Loading>
+          <TsRow :gutter="10">
+            <Col span="24">
+              <Alert show-icon>{{ $t('term.inspect.thressholdrulealert') }}</Alert>
+            </Col>
+          </TsRow>
+          <TsRow :gutter="10">
+            <Col span="14">
+            </Col>
+            <Col span="10">
+              <InputSearcher
+                v-model="keyword"
+                :placeholder="$t('page.appname')+$t('term.deploy.abbreviation')"
+                style="margin-right: 12px;"
+                @change="() => getDataList(1)"
+              ></InputSearcher>
+            </Col>
+          </TsRow>
+          <div v-if="!loadingShow" class="content-wrap">
+            <TsCard
+              v-model="selectedRuleIdList"
+              v-bind="cardData"
+              :bodyStyle="{padding: '14px 22px', minHeight: '75px'}"
+              :sm="8"
+              :lg="8"
+              :xl="8"
+              :xxl="8"
+              :boxShadow="false"
+              @updatePage="getDataList"
+              @getSelected="getSelected"
+            >
+              <template slot-scope="{ row }">
+                <div class="cursor">
+                  <div class="overflow" :title="row.abbrName">{{ row.abbrName }}</div>
+                  <div class="text-grey overflow pt-xs" :title="row.name">{{ row.name || '-' }}</div>
+                </div>
+              </template>
+            </TsCard>
+          </div>
+        </div>
+      </template>
+    </TsDialog>
+  </div>
+</template>
+<script>
+export default {
+  name: '', // 选择组合工具弹窗入口
+  components: {
+    TsCard: () => import('@/resources/components/TsCard/TsCard.vue'),
+    InputSearcher: () => import('@/resources/components/InputSearcher/InputSearcher.vue')
+  },
+  props: {
+    copyRuleData: {
+      type: Object,
+      default: function() {
+        return {};
+      }
+    }
+  },
+  data() {
+    return {
+      loadingShow: true,
+      keyword: '',
+      selectedIdList: [],
+      selectedRuleIdList: [],
+      cardData: {
+        canSelect: true,
+        keyName: 'id',
+        currentPage: 1,
+        pageSize: 21,
+        pageCount: 1
+      }
+    };
+  },
+  beforeCreate() {},
+  created() {
+    this.getDataList();
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    closeDialog() {
+      this.$emit('close');
+    },
+    getDataList(currentPage = 1) {
+      let params = {
+        keyword: this.keyword,
+        currentPage: currentPage || this.cardData.currentPage,
+        pageSize: this.cardData.pageSize
+      };
+      this.loadingShow = true;
+      this.$api.cmdb.applicationManage.getAppsystemListTree(params).then(res => {
+        if (res && res.Status == 'OK') {
+          Object.assign(this.cardData, res.Return);
+        }
+      }).finally(() => {
+        this.loadingShow = false;
+      });
+    },
+    okDialog() {
+      if (this.$utils.isEmpty(this.selectedIdList)) {
+        this.$Message.warning(this.$t('term.inspect.selectapp'));
+        return false;
+      } else {
+        this.$api.inspect.definition.copyCollectionThreshold({...this.copyRuleData, targetAppSystemIdList: this.selectedIdList}).then(res => {
+          if (res && res.Status == 'OK') {
+            this.$Message.success(this.$t('message.savesuccess'));
+            this.closeDialog();
+          }
+        });
+      }
+    },
+    getSelected(val, items) {
+      this.selectedIdList = val;
+    }
+  },
+  filter: {},
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang="less" scoped>
+</style>
diff --git a/src/views/pages/inspect/applicationNew/threshold/rule-of-threshold-detail.vue b/src/views/pages/inspect/applicationNew/threshold/rule-of-threshold-detail.vue
new file mode 100644
index 000000000..c6ca1a8a6
--- /dev/null
+++ b/src/views/pages/inspect/applicationNew/threshold/rule-of-threshold-detail.vue
@@ -0,0 +1,173 @@
+
+<template>
+  <div>
+    <Loading :loadingShow="loadingShow" type="fix"></Loading>
+    <TsContain :siderWidth="450">
+      <template v-slot:navigation>
+        <span v-if="$hasBack()" class="tsfont-left text-action" @click="$back()">{{ $getFromPage() }}</span>
+      </template>
+      <template v-slot:topLeft>
+        <div class="action-group">
+          <span v-if="appSystemCollectionName" class="action-item">{{ appSystemCollectionName }}</span>
+          <span v-if="headerObj && headerObj.userVo" class="action-item text-grey">{{ headerObj.userVo.name }}</span>
+          <span v-if="headerObj && headerObj.lcd" class="action-item text-grey">{{ headerObj.lcd | formatDate }}</span>
+        </div>
+      </template>
+      <template v-slot:topRight>
+        <div class="action-group">
+          <span v-if="$AuthUtils.hasRole('INSPECT_MODIFY')" class="tsfont-copy action-item" @click="copyRuleOfThreshold">{{ $t('dialog.title.copytarget', {target: $t('page.rule')}) }}</span>
+          <span v-if="$AuthUtils.hasRole('INSPECT_MODIFY')" class="action-item"><Button type="primary" @click="saveThresholdRule">{{ $t('page.save') }}</Button></span>
+        </div>
+      </template>
+      <template v-slot:sider>
+        <div style="width: 434px;">
+          <!-- 数据结构 -->
+          <JsonViewer
+            id="json-viewer-wrap"
+            :expanded="true"
+            style="height: calc(100vh - 120px);overflow: auto;"
+            class="radius-lg bg-grey"
+            :expand-depth="5"
+            :value="fields"
+          ></JsonViewer>
+        </div>
+      </template>
+      <template v-slot:content>
+        <div>
+          <AppThresholdRuleAdd v-show="!loadingShow" ref="ruleAdd" :thresholdsData="thresholds"></AppThresholdRuleAdd>
+        </div>
+      </template>
+    </TsContain>
+    <CopyRuleDialog v-if="isShowCopyRuleDialog" :copyRuleData="{name: inspectName, appSystemId: appSystemId}" @close="closeCopyRuleDialog"></CopyRuleDialog>
+  </div>
+</template>
+<script>
+export default {
+  name: '', // 阈值规则详情
+  components: {
+    JsonViewer: () => import('vue-json-viewer'),
+    AppThresholdRuleAdd: () => import('./app-threshold-rule-add.vue'), // 添加规则
+    CopyRuleDialog: () => import('./copy-rule-dialog')
+  },
+  filters: {},
+  props: {},
+  data() {
+    return {
+      thresholds: {},
+      fields: {}, // 结构
+      loadingShow: false,
+      isShowCopyRuleDialog: false,
+      inspectName: '',
+      appSystemId: null,
+      headerObj: {},
+      appSystemCollectionName: '' // 应用系统名称+集合名称
+    };
+  },
+  beforeCreate() {},
+  created() {
+    let query = this.$route.query;
+    if (query && query.appSystemId && query.name) {
+      this.inspectName = query.name;
+      this.appSystemId = parseInt(query.appSystemId);
+      this.getAppCollectionFields({appSystemId: parseInt(query.appSystemId), name: query.name});
+    }
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    getAppCollectionFields(params) {
+      this.loadingShow = true;
+      this.fields = {};
+      this.thresholds = {};
+      this.headerObj = {};
+      this.$api.inspect.definition.getAppCollectionFields(params).then((res) => {
+        if (res.Status == 'OK') {
+          let data = res.Return;
+          this.fields = data.fields;
+          let collectionName = data.label || '';
+          let appSystemName = data.appSystemAbbrName ? (data.appSystemName ? `${data.appSystemAbbrName}(${data.appSystemName})` : data.appSystemAbbrName) : (data.appSystemName || '');
+          this.appSystemCollectionName = appSystemName ? (collectionName ? `${appSystemName} - ${collectionName}` : appSystemName) : (collectionName || '');
+          this.thresholds = {
+            globalThresholds: data.globalThresholds || [],
+            appThresholds: data.appThresholds || []
+          };
+          this.headerObj = {
+            lcd: data.lcd,
+            userVo: data.userVo
+          };
+        }
+      }).finally(() => {
+        this.loadingShow = false;
+        if (this.$route.query && this.$route.query.ruleId) {
+          this.$nextTick(() => {
+            this.$refs.ruleAdd && this.$refs.ruleAdd.jumpTo(`#to_${this.$route.query.ruleId}`);
+          });
+        }
+      });
+    },
+    updateThresholdsList() {
+      // 获取规则列表
+      let ruleAdd = this.$refs.ruleAdd;
+      let formValue = (ruleAdd && ruleAdd.getFormValue()) || '';
+      return (formValue && formValue.thresholds) || [];
+    },
+    getInitData() {
+      return (this.$refs.ruleAdd && this.$refs.ruleAdd.getInitData()) || [];
+    },
+    saveThresholdRule() {
+      // 处理保存
+      if (!this.$refs.ruleAdd.valid()) {
+        return false;
+      }
+      let params = {
+        appSystemId: this.appSystemId,
+        name: this.inspectName,
+        ...this.$refs.ruleAdd.getFormValue()
+      };
+      this.$api.inspect.definition.saveCollectionThresholds(params).then((res) => {
+        if (res.Status == 'OK') {
+          this.getAppCollectionFields({appSystemId: this.appSystemId, name: this.inspectName});
+          this.$Message.success(this.$t('message.savesuccess'));
+        }
+      });
+    },
+    copyRuleOfThreshold() {
+      this.isShowCopyRuleDialog = true;
+    },
+    closeCopyRuleDialog(needRefresh) {
+      this.isShowCopyRuleDialog = false;
+      if (needRefresh) {
+        this.getAppCollectionFields({appSystemId: this.appSystemId, name: this.inspectName});
+      }
+    }
+  },
+  computed: {},
+  watch: {},
+  beforeRouteLeave(to, from, next, url) {
+    if (this.$utils.isSame(this.getInitData(), this.updateThresholdsList())) {
+      //当没有改动时直接跳转页面
+      url ? this.$utils.gotoHref(url) : next(true);
+    } else {
+      let _this = this;
+      if (this.$AuthUtils.hasRole('INSPECT_MODIFY')) {
+        this.$utils.jumpDialog.call(this, {
+          save: {
+            fn: async(vnode) => {
+              return await _this.saveThresholdRule();
+            }
+          }
+        }, to, from, next, url);
+      }
+    }
+  }
+};
+</script>
+
+<style lang="less" scoped>
+</style>
diff --git a/src/views/pages/inspect/applicationNew/threshold/rule-of-threshold-dialog.vue b/src/views/pages/inspect/applicationNew/threshold/rule-of-threshold-dialog.vue
new file mode 100644
index 000000000..bc3940ff9
--- /dev/null
+++ b/src/views/pages/inspect/applicationNew/threshold/rule-of-threshold-dialog.vue
@@ -0,0 +1,127 @@
+<template>
+  <div>
+    <TsDialog
+      :title="$t('term.inspect.thresholdrule')"
+      type="modal"
+      width="small"
+      :isShow="true"
+      :hasFooter="false"
+      @on-close="closeDialog"
+    >
+      <template v-slot>
+        <div>
+          <Loading
+            :loadingShow="loadingShow"
+            type="fix"
+          ></Loading>
+          <ul v-if="!$utils.isEmptyObj(resourceList)">
+            <li class="current-rule-threshold-wrap">
+              <div>{{ $t('term.inspect.assetthresholdrule') }}</div>
+              <ul>
+                <template v-for="(item,index) in resourceList">
+                  <li
+                    :key="index"
+                    class="text-href mb-sm"
+                    @click="toRuleThresholdPage(item)"
+                  >
+                    {{ item.text }}
+                  </li>
+                </template>
+              </ul>
+            </li>
+          </ul>
+        </div>
+      </template>
+    </TsDialog>
+  </div>
+</template>
+<script>
+export default {
+  name: '', // 选择组合工具弹窗入口
+  components: {},
+  props: {
+    resourceId: {
+      type: [Number, String]
+    }
+  },
+  data() {
+    return {
+      loadingShow: true,
+      resourceList: []
+    };
+  },
+  beforeCreate() {},
+  created() {
+    this.getDataList();
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    closeDialog() {
+      this.$emit('close');
+    },
+    getDataList() {
+      this.loadingShow = true;
+      this.resourceList = [];
+      this.$api.inspect.definition.getThresholdSource({resourceId: this.resourceId}).then(res => {
+        if (res && res.Status == 'OK') {
+          let appSystemVoList = res.Return ? res.Return.appSystemVoList : [];
+          let resourceVo = res.Return ? res.Return.resourceVo : {}; 
+          let collectionName = res.Return ? res.Return.collectionName : ''; 
+          if (!this.$utils.isEmpty(appSystemVoList) && !this.$utils.isEmptyObj(resourceVo)) {
+            appSystemVoList && appSystemVoList.forEach((v) => {
+              this.resourceList.push({
+                appSystemId: v.id,
+                text: `${resourceVo.typeLabel}->${v.abbrName ? (v.name ? v.abbrName + '(' + v.name + ')' : v.abbrName) : ''}${this.$t('term.inspect.thresholdrule')}`,
+                typeName: resourceVo.typeName,
+                typeLabel: resourceVo.typeLabel,
+                collectionName: collectionName
+              });
+            });
+          }
+          if (!this.$utils.isEmptyObj(resourceVo)) {
+            this.resourceList.unshift({
+              flag: 'global', // 全局阈值
+              text: `${resourceVo.typeLabel}->${this.$t('term.inspect.globalthresholdrule')}`,
+              typeName: resourceVo.typeName,
+              typeLabel: resourceVo.typeLabel,
+              collectionName: collectionName
+            });
+          }
+        }
+      }).finally(() => {
+        this.loadingShow = false;
+      });
+    },
+    toRuleThresholdPage(row) {
+      if (row && !this.$utils.isEmptyObj(row)) {
+        if (row.flag == 'global') {
+          this.$router.push({
+            path: '/definition-detail',
+            query: {name: row.collectionName}
+          });
+        } else {
+          this.$router.push({
+            path: '/rule-of-threshold-detail',
+            query: { name: row.collectionName, appSystemId: row.appSystemId}
+          });
+        }
+      }
+    }
+  },
+  filter: {},
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang="less" scoped>
+.current-rule-threshold-wrap {
+  display: flex;
+}
+</style>
diff --git a/src/views/pages/inspect/applicationNew/threshold/rule-of-threshold-manage.vue b/src/views/pages/inspect/applicationNew/threshold/rule-of-threshold-manage.vue
new file mode 100644
index 000000000..51e3c1eb3
--- /dev/null
+++ b/src/views/pages/inspect/applicationNew/threshold/rule-of-threshold-manage.vue
@@ -0,0 +1,157 @@
+
+<template>
+  <div>
+    <Loading :loadingShow="loadingShow" type="fix"></Loading>
+    <TsContain>
+      <template v-slot:navigation>
+        <span v-if="$hasBack()" class="text-action tsfont-left" @click="$back()">{{ $getFromPage() }}</span>
+      </template>
+      <template v-slot:topRight>
+        <div>
+          <InputSearcher
+            v-model="formInputSetting.value"
+            v-bind="formInputSetting"
+            @change="getTableList()"
+          ></InputSearcher>
+        </div>
+      </template>
+      <div slot="content">
+        <div v-if="!loadingShow && inspectDefinitionList.length > 0" class="content-main">
+          <div v-for="(item, index) in inspectDefinitionList" :key="index">
+            <div v-if="item && item.cardList && item.cardList.length > 0" class="title text-title ci-title-text">
+              <span class="text-grey tsfont-formstaticlist">{{ item.collection }}</span>
+            </div>
+            <div>
+              <TsCard
+                v-if="item && item.cardList && item.cardList.length > 0"
+                v-bind="item"
+                :sm="8"
+                :lg="6"
+                :xl="6"
+                :xxl="4"
+                :boxShadow="false"
+              >
+                <template slot-scope="{ row }">
+                  <div class="ci-main" @click="toRuleOfThresholdDetail(row)">
+                    <div>
+                      <div class="ci-icon">
+                        <i :class="`tsfont-${row.name}`"></i>
+                      </div>
+                    </div>
+                    <div class="overflow">
+                      <div class="ci-label overflow" :title="row.label">{{ row.label }}</div>
+                      <div class="ci-name overflow text-grey" :title="row.name">{{ row.name }}</div>
+                    </div>
+                  </div>
+                </template>
+              </TsCard>
+            </div>
+          </div>
+        </div>
+        <NoData v-else />
+      </div>
+    </TsContain>
+  </div>
+</template>
+<script>
+export default {
+  name: 'RuleOfThresholdManage', // 巡检规则
+  components: {
+    InputSearcher: () => import('@/resources/components/InputSearcher/InputSearcher.vue'),
+    TsCard: () => import('@/resources/components/TsCard/TsCard.vue')
+  },
+  filters: {},
+  props: {},
+  data() {
+    return {
+      loadingShow: true,
+      inspectDefinitionList: [],
+      appSystemId: null,
+      formInputSetting: {
+        placeholder: this.$t('page.name'),
+        search: true,
+        clearable: true,
+        value: '',
+        border: 'border'
+      }
+
+    };
+  },
+  beforeCreate() {},
+  created() {
+    let query = this.$route.query;
+    if (query && query.appSystemId) {
+      this.appSystemId = parseInt(query.appSystemId);
+      this.getTableList();
+    }
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  methods: {
+    getTableList() {
+      this.loadingShow = true;
+      this.$api.inspect.definition.getThresholdsCollectionList({appSystemId: this.appSystemId, name: this.formInputSetting.value}).then(res => {
+        if (res.Status == 'OK') {
+          let tempObj = {};
+          let tbodyList = res.Return ? res.Return : [];
+          tbodyList.forEach((item) => {
+            let {collection} = item;
+            if (!tempObj[collection]) {
+              tempObj[collection] = {
+                collection,
+                cardList: []
+              };
+            }
+            tempObj[collection].cardList.push(item);
+          });
+          this.inspectDefinitionList = Object.values(tempObj);
+        }
+      }).finally(() => {
+        this.loadingShow = false;
+      });
+    },
+    toRuleOfThresholdDetail(row) {
+      if (row && !this.$utils.isEmptyObj(row)) {
+        this.$router.push({
+          path: '/rule-of-threshold-detail',
+          query: { appSystemId: this.appSystemId, name: row.name, label: row.label }
+        });
+      }
+    }
+  },
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang="less" scoped>
+.content-main {
+  .type-main{
+    margin-bottom:10px;
+  }
+  .ci-title-text{
+    padding-left: 12px;
+  }
+}
+.ci-main {
+  cursor: pointer;
+  display: grid;
+  width: 100%;
+  grid-template-columns: 40px auto;
+  margin: 10px;
+  .ci-icon {
+    font-size: 24px;
+  }
+  .ci-label {
+    font-size: 14px;
+    margin-bottom: 2px;
+  }
+  .ci-name {
+    font-size: 12px;
+  }
+}
+</style>
diff --git a/src/views/pages/inspect/router.js b/src/views/pages/inspect/router.js
index b34fb69b7..8cc8fb565 100644
--- a/src/views/pages/inspect/router.js
+++ b/src/views/pages/inspect/router.js
@@ -21,6 +21,7 @@ const ciEntityView = () => import('@/views/pages/cmdb/cientity/cientity-view.vue
 const ciEntityEdit = () => import('@/views/pages/cmdb/cientity/cientity-edit.vue');//配置项编辑
 
 const applicationManage = () => import('./application/application-manage.vue');//应用巡检
+const applicationManageNew = () => import('./applicationNew/application-manage.vue');//新的应用巡检
 const configfileManage = () => import('./configfile/configfile-manage.vue');
 const configfileDetail = () => import('./configfile/configfile-detail.vue');
 const configfileListManage = () => import('./configfile/configfile-list-manage.vue');
@@ -140,6 +141,18 @@ export default [
       authority: 'INSPECT_BASE',
       type: 'inspectmanage'
     }
+  }, 
+  {
+    path: '/application-manage-new',
+    name: 'application-manage-new',
+    component: applicationManageNew,
+    meta: {
+      title: '新的应用巡检',
+      ismenu: true,
+      icon: 'tsfont-app',
+      authority: 'INSPECT_BASE',
+      type: 'inspectmanage'
+    }
   },
   {
     path: '/assets-detail-:id?',
-- 
Gitee


From 75c313742bcdaab4ff5d1e3d38119665da7eea22 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Fri, 21 Mar 2025 16:54:59 +0800
Subject: [PATCH 17/20] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20#[1349157963399168?=
 =?UTF-8?q?]CMDB=E5=BA=94=E7=94=A8=E6=B8=85=E5=8D=95=E6=94=B9=E6=88=90?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=B1=82=E7=BA=A7=E5=8F=AF=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=20http://192.168.0.96:8090/demo/rdm.html#/story-detail/9390509?=
 =?UTF-8?q?47543040/939050947543042/1349157963399168?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resourceentity/resourceentity-manage.vue  |  399 ++---
 .../inspection-assets-manage.vue              |  915 ++++++-----
 .../latest-questions-manage.vue               | 1439 ++++++++---------
 3 files changed, 1376 insertions(+), 1377 deletions(-)

diff --git a/src/views/pages/cmdb/resourceentity/resourceentity-manage.vue b/src/views/pages/cmdb/resourceentity/resourceentity-manage.vue
index 91f7fea67..c2f9991aa 100644
--- a/src/views/pages/cmdb/resourceentity/resourceentity-manage.vue
+++ b/src/views/pages/cmdb/resourceentity/resourceentity-manage.vue
@@ -1,199 +1,200 @@
-<template>
-  <div>
-    <Loading :loadingShow="loadingShow" type="fix"></Loading>
-    <TsContain>
-      <template v-slot:topLeft>
-        <span class="text-action tsfont-plus" @click="addData()">{{ $t('term.cmdb.view') }}</span>
-      </template>
-      <template v-slot:topRight>
-        <InputSearcher v-model="keyword"></InputSearcher>
-      </template>
-      <template v-slot:content>
-        <TsTable v-if="tbodyList" :theadList="theadList" :tbodyList="finalTbodyList">
-          <template v-slot:name="{ row }">
-            <a @click="editEntity(row)">{{ row.name }}</a>
-          </template>
-          <template v-slot:status="{ row }">
-            <span v-if="row.status === 'error'" class="text-error">{{ $t('page.exception') }}</span>
-            <span v-if="row.error">
-              <Poptip :transfer="true" placement="right" trigger="hover">
-                <i class="tsfont-warning-s text-error"></i>
-                <div slot="content">
-                  {{ row.error }}
-                </div>
-              </Poptip>
-            </span>
-            <span v-else-if="row.status === 'ready'" class="text-success">{{ $t('page.pending') }}</span>
-            <span v-else-if="row.status === 'pending'" class="text-grey">{{ $t('page.notbuild') }}</span>
-          </template>
-          <template v-slot:action="{ row }">
-            <div class="tstable-action">
-              <ul class="tstable-action-ul">
-                <li v-if="row.isMultiple" class="tsfont-copy" @click="copyEntity(row)">{{ $t('page.copy') }}</li>
-                <li v-if="row.isMultiple" class="tsfont-trash-o" @click="deleteEntity(row)">{{ $t('page.delete') }}</li>
-                <li class="tsfont-circulation-s" @click="viewData(1, 10, row.name)">{{ $t('page.viewdata') }}</li>
-              </ul>
-            </div>
-          </template>
-        </TsTable>
-      </template>
-    </TsContain>
-    <ResourceEditDialog
-      v-if="isEditShow"
-      :name="currentEntityName"
-      :isCopy="isCopy"
-      @close="closeEntityDialog"
-    ></ResourceEditDialog>
-    <TsDialog
-      v-bind="dialogConfig"
-      @on-close="close"
-    >
-      <TsTable
-        :fixedHeader="false"
-        v-bind="viewDataTable"
-        @changeCurrent="viewData"
-        @changePageSize="viewData(1, ...arguments)"
-      ></TsTable>
-    </TsDialog>
-  </div>
-</template>
-<script>
-export default {
-  name: '',
-  components: {
-    TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
-    ResourceEditDialog: () => import('./resourceentity-edit.vue'),
-    InputSearcher: () => import('@/resources/components/InputSearcher/InputSearcher.vue')
-  },
-  props: {},
-  data() {
-    return {
-      loadingShow: true,
-      keyword: '',
-      currentEntityId: null,
-      isEditShow: false,
-      theadList: [
-        {
-          key: 'name',
-          title: this.$t('term.cmdb.view')
-        },
-        { key: 'label', title: this.$t('page.name') },
-        { key: 'status', title: this.$t('page.status') },
-        { key: 'initTime', title: this.$t('page.inittime'), type: 'time' },
-        { key: 'description', title: this.$t('page.description') },
-        {
-          key: 'action'
-        }
-      ],
-      tbodyList: [],
-      dialogConfig: {
-        type: 'modal',
-        maskClose: false,
-        isShow: false,
-        width: 'large',
-        title: '',
-        hasFooter: false
-      },
-      viewDataTable: {},
-      viewDataParams: {
-        currentPage: 1,
-        pageSize: 10,
-        name: ''
-      },
-      isCopy: false
-    };
-  },
-  beforeCreate() {},
-  created() {
-    this.getResourceEntityList();
-  },
-  beforeMount() {},
-  mounted() {},
-  beforeUpdate() {},
-  updated() {},
-  activated() {},
-  deactivated() {},
-  beforeDestroy() {},
-  destroyed() {},
-  methods: {
-    editEntity(row) {
-      this.currentEntityName = row.name;
-      this.isEditShow = true;
-    },
-    getResourceEntityList() {
-      this.loadingShow = true;
-      this.$api.cmdb.resourceentity.searchResourceEntity().then(res => {
-        this.tbodyList = res.Return;
-      }).finally(() => {
-        this.loadingShow = false;
-      });
-    },
-    viewData(currentPage, pageSize, name) {
-      if (currentPage) {
-        this.viewDataParams.currentPage = currentPage;
-      }
-      if (pageSize) {
-        this.viewDataParams.pageSize = pageSize;
-      }
-      if (name) {
-        this.dialogConfig.title = name;
-        this.viewDataParams.name = name;
-      }
-      this.$api.cmdb.resourceentity.getResourceEntityViewDataList(this.viewDataParams).then(res => {
-        this.viewDataTable = res.Return;
-        this.dialogConfig.isShow = true;
-      });
-    },
-    close() {
-      this.dialogConfig.isShow = false;
-      this.viewDataTable = {};
-      this.dialogConfig.title = '';
-      this.viewDataParams.name = '';
-    },
-    closeEntityDialog(needRefresh) {
-      this.isEditShow = false;
-      this.isCopy = false;
-      if (needRefresh) {
-        this.getResourceEntityList();
-      }
-    },
-    addData() {
-      this.currentEntityName = '';
-      this.isEditShow = true; 
-    },
-    copyEntity(row) {
-      this.currentEntityName = row.name;
-      this.isCopy = true;
-      this.isEditShow = true;
-    },
-    deleteEntity(row) {
-      this.$createDialog({
-        title: this.$t('dialog.title.deleteconfirm'),
-        content: this.$t('dialog.content.deletetargetconfirm', {'target': row.name}),
-        btnType: 'error',
-        'on-ok': vnode => {
-          this.$api.cmdb.resourceentity.deleteResourceentityData({name: row.name}).then(res => {
-            if (res.Status == 'OK') {
-              vnode.isShow = false;
-              this.$Message.success(this.$t('message.deletesuccess'));
-              this.getResourceEntityList();
-            }
-          });
-        }
-      });
-    }
-  },
-  filter: {},
-  computed: {
-    finalTbodyList() {
-      if (this.keyword) {
-        const k = this.keyword.toLowerCase();
-        return this.tbodyList.filter(d => (d.name && d.name.toLowerCase().includes(k)) || (d.label && d.label.toLowerCase().includes(k)) || (d.description && d.description.toLowerCase().includes(k)));
-      }
-      return this.tbodyList;
-    }
-  },
-  watch: {}
-};
-</script>
-<style lang="less"></style>
+<template>
+  <div>
+    <Loading :loadingShow="loadingShow" type="fix"></Loading>
+    <TsContain>
+      <template v-slot:topLeft>
+        <span class="text-action tsfont-plus" @click="addData()">{{ $t('term.cmdb.view') }}</span>
+      </template>
+      <template v-slot:topRight>
+        <InputSearcher v-model="keyword"></InputSearcher>
+      </template>
+      <template v-slot:content>
+        <TsTable v-if="tbodyList" :theadList="theadList" :tbodyList="finalTbodyList">
+          <template v-slot:name="{ row }">
+            <a @click="editEntity(row)">{{ row.name }}</a>
+          </template>
+          <template v-slot:status="{ row }">
+            <span v-if="row.status === 'error'" class="text-error">{{ $t('page.exception') }}</span>
+            <span v-if="row.error">
+              <Poptip :transfer="true" placement="right" trigger="hover">
+                <i class="tsfont-warning-s text-error"></i>
+                <div slot="content">
+                  {{ row.error }}
+                </div>
+              </Poptip>
+            </span>
+            <span v-else-if="row.status === 'ready'" class="text-success">{{ $t('page.pending') }}</span>
+            <span v-else-if="row.status === 'pending'" class="text-grey">{{ $t('page.notbuild') }}</span>
+          </template>
+          <template v-slot:action="{ row }">
+            <div class="tstable-action">
+              <ul class="tstable-action-ul">
+                <li v-if="row.isMultiple" class="tsfont-copy" @click="copyEntity(row)">{{ $t('page.copy') }}</li>
+                <li v-if="row.isMultiple" class="tsfont-trash-o" @click="deleteEntity(row)">{{ $t('page.delete') }}</li>
+                <li class="tsfont-circulation-s" @click="viewData(1, 10, row.name)">{{ $t('page.viewdata') }}</li>
+              </ul>
+            </div>
+          </template>
+        </TsTable>
+      </template>
+    </TsContain>
+    <ResourceEditDialog
+      v-if="isEditShow"
+      :name="currentEntityName"
+      :isCopy="isCopy"
+      @close="closeEntityDialog"
+    ></ResourceEditDialog>
+    <TsDialog
+      v-bind="dialogConfig"
+      @on-close="close"
+    >
+      <TsTable
+        :fixedHeader="false"
+        v-bind="viewDataTable"
+        @changeCurrent="viewData"
+        @changePageSize="viewData(1, ...arguments)"
+      ></TsTable>
+    </TsDialog>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
+    ResourceEditDialog: () => import('./resourceentity-edit.vue'),
+    InputSearcher: () => import('@/resources/components/InputSearcher/InputSearcher.vue')
+  },
+  props: {},
+  data() {
+    return {
+      loadingShow: true,
+      keyword: '',
+      currentEntityId: null,
+      isEditShow: false,
+      theadList: [
+        {
+          key: 'name',
+          title: this.$t('term.cmdb.view')
+        },
+        { key: 'label', title: this.$t('page.name') },
+        { key: 'moduleName', title: this.$t('term.framework.belongmodule') },
+        { key: 'status', title: this.$t('page.status') },
+        { key: 'initTime', title: this.$t('page.inittime'), type: 'time' },
+        { key: 'description', title: this.$t('page.description') },
+        {
+          key: 'action'
+        }
+      ],
+      tbodyList: [],
+      dialogConfig: {
+        type: 'modal',
+        maskClose: false,
+        isShow: false,
+        width: 'large',
+        title: '',
+        hasFooter: false
+      },
+      viewDataTable: {},
+      viewDataParams: {
+        currentPage: 1,
+        pageSize: 10,
+        name: ''
+      },
+      isCopy: false
+    };
+  },
+  beforeCreate() {},
+  created() {
+    this.getResourceEntityList();
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    editEntity(row) {
+      this.currentEntityName = row.name;
+      this.isEditShow = true;
+    },
+    getResourceEntityList() {
+      this.loadingShow = true;
+      this.$api.cmdb.resourceentity.searchResourceEntity().then(res => {
+        this.tbodyList = res.Return;
+      }).finally(() => {
+        this.loadingShow = false;
+      });
+    },
+    viewData(currentPage, pageSize, name) {
+      if (currentPage) {
+        this.viewDataParams.currentPage = currentPage;
+      }
+      if (pageSize) {
+        this.viewDataParams.pageSize = pageSize;
+      }
+      if (name) {
+        this.dialogConfig.title = name;
+        this.viewDataParams.name = name;
+      }
+      this.$api.cmdb.resourceentity.getResourceEntityViewDataList(this.viewDataParams).then(res => {
+        this.viewDataTable = res.Return;
+        this.dialogConfig.isShow = true;
+      });
+    },
+    close() {
+      this.dialogConfig.isShow = false;
+      this.viewDataTable = {};
+      this.dialogConfig.title = '';
+      this.viewDataParams.name = '';
+    },
+    closeEntityDialog(needRefresh) {
+      this.isEditShow = false;
+      this.isCopy = false;
+      if (needRefresh) {
+        this.getResourceEntityList();
+      }
+    },
+    addData() {
+      this.currentEntityName = '';
+      this.isEditShow = true; 
+    },
+    copyEntity(row) {
+      this.currentEntityName = row.name;
+      this.isCopy = true;
+      this.isEditShow = true;
+    },
+    deleteEntity(row) {
+      this.$createDialog({
+        title: this.$t('dialog.title.deleteconfirm'),
+        content: this.$t('dialog.content.deletetargetconfirm', {'target': row.name}),
+        btnType: 'error',
+        'on-ok': vnode => {
+          this.$api.cmdb.resourceentity.deleteResourceentityData({name: row.name}).then(res => {
+            if (res.Status == 'OK') {
+              vnode.isShow = false;
+              this.$Message.success(this.$t('message.deletesuccess'));
+              this.getResourceEntityList();
+            }
+          });
+        }
+      });
+    }
+  },
+  filter: {},
+  computed: {
+    finalTbodyList() {
+      if (this.keyword) {
+        const k = this.keyword.toLowerCase();
+        return this.tbodyList.filter(d => (d.name && d.name.toLowerCase().includes(k)) || (d.label && d.label.toLowerCase().includes(k)) || (d.description && d.description.toLowerCase().includes(k)));
+      }
+      return this.tbodyList;
+    }
+  },
+  watch: {}
+};
+</script>
+<style lang="less"></style>
diff --git a/src/views/pages/inspect/applicationNew/inspection-assets-manage.vue b/src/views/pages/inspect/applicationNew/inspection-assets-manage.vue
index bb7499bd7..718e94837 100644
--- a/src/views/pages/inspect/applicationNew/inspection-assets-manage.vue
+++ b/src/views/pages/inspect/applicationNew/inspection-assets-manage.vue
@@ -1,458 +1,457 @@
-<template>
-  <div class="inspection-assets-manage-wrap padding">
-    <Loading :loadingShow="loadingShow" type="fix"></Loading>
-    1
-    <div v-if="envList && envList.length > 0" class="pb-sm li-box">
-      <Row :gutter="16">
-        <Col
-          v-for="item in envList"
-          :key="item.id"
-          :xs="12"
-          :sm="8"
-          :md="6"
-          :lg="4"
-          :xl="3"
-          :xxl="2"
-        >
-          <div
-            v-if="item.name"
-            class="li-item text-action"
-            :class="envId == item.id ? 'li-active li-text border-primary' : 'border-base bg-op'"
-            @click="selectedEnv(item.name)"
-          >{{ item.name }}</div>
-        </Col>
-      </Row>
-    </div>
-    <div v-if="tableList && tableList.length > 0 ">
-      <div v-for="(item, index) in tableList" :key="index">
-        <div class="h3 padding-sm">{{ item.viewLabel }}</div>
-        <TsTable
-          v-bind="filterTypeFields(item)"
-          @changeCurrent="(currentPage) => changeCurrent(currentPage, item, index)"
-          @changePageSize="(pageSize) => changePageSize(pageSize,item, index)"
-        >
-          <template v-slot:ip="{ row }">
-            <span class="text-href" @click.stop="gotoDetails(row)">
-              <span>{{ row.ip.ip }}</span>
-              <span v-if="row.ip.port">:{{ row.ip.port }}</span>
-            </span>
-          </template>
-          <template v-slot:allIpList="{ row }">
-            <div v-if="!$utils.isEmpty(row.allIpList)">
-              <Tag
-                v-for="(v, vindex) in row.allIpList"
-                :key="vindex"
-                class="cursor-pointer"
-                @click.native="toCientityView(v)"
-              >
-                {{ v.name }}
-              </Tag>
-            </div>
-            <div v-else></div>
-          </template>
-          <template v-slot:lcu="{row}">
-            <UserCard v-bind="row.lcu" :hideAvatar="true"></UserCard>
-          </template>
-          <template v-slot:lcd="{ row }">
-            <div v-if="row.lcd">{{ row.lcd | formatDate }}</div>
-          </template>
-          <template v-slot:fcu="{ row }">
-            <UserCard v-bind="row.fcu" :hideAvatar="true"></UserCard>
-          </template>
-          <template v-slot:fcd="{ row }">
-            <div v-if="row.fcd">{{ row.fcd | formatDate }}</div>
-          </template>
-          <template v-slot:monitor="{ row }">
-            <!-- 监控状态 -->
-            <span v-if="row.monitor && row.monitor.time" :title="row.monitor.time | formatDate">
-              <span :class="[row.monitor.cssClass, {'background-FATAL': row.monitor.value== 'FATAL'}]" class="vertical">{{ row.monitor.text }} </span>
-              <span class="text-title">
-                {{ handleTimes(row.monitor.time) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
-              </span>
-            </span>
-            <span v-else></span>
-          </template>
-          <template v-slot:inspect="{ row }">
-            <!-- 巡检状态 -->
-            <span v-if="row.inspect && row.inspect.time" :title="row.inspect.time | formatDate">
-              <span :class="[row.inspect.cssClass, {'background-FATAL': row.inspect.value== 'FATAL'}]" class="vertical cursor" @click="toInspectStatusDetail(row)">{{ row.inspect.text }} </span>
-              <span class="text-title">
-                {{ handleTimes(row.inspect.time) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
-              </span>
-            </span>
-            <span v-else>
-              <span>-</span>
-            </span>
-          </template>
-          <template v-slot:taskStatus="{ row }">
-            <CommonStatus
-              v-if="row.taskStatus"
-              :statusName="row.taskStatus.text"
-              :statusValue="row.taskStatus.value"
-              type="text"
-            ></CommonStatus>
-            <span v-else>-</span>
-          </template>
-          <template v-slot:vendor="{ row }">
-            <Tag
-              v-if="!$utils.isEmpty(row.vendor)"
-              class="cursor-pointer"
-              @click.native="toCientityView(row.vendor)"
-            >
-              {{ row.vendor.name }}
-            </Tag>
-            <span v-else></span>
-          </template>
-          <template v-slot:appModule="{ row }">
-            <div v-if="!$utils.isEmpty(row.appModule)" class="text-href" @click="toCientityView(row.appModule)">
-              <span :class="row.appModule.ciIcon"></span>
-              <span>{{ row.appModule.name }}</span>
-            </div>
-          </template>
-          <template v-slot:appEnvironment="{ row }">
-            <Tag
-              v-if="!$utils.isEmpty(row.appEnvironment)"
-              class="cursor-pointer"
-              @click.native="toGlobalAttrManage()"
-            >
-              {{ row.appEnvironment.value }}
-            </Tag>
-          </template>
-          <template v-slot:appSystem="{row}">
-            <!-- 应用系统 -->
-            <div v-if="!$utils.isEmpty(row.appSystem)" class="text-href" @click="toCientityView(row.appSystem)">
-              <span :class="row.appSystem.ciIcon"></span>
-              <span>{{ row.appSystem.name }}</span>
-            </div>
-          </template>
-          <template v-slot:ownerList="{ row }">
-            <div v-if="!$utils.isEmpty(row.ownerList)">
-              <Tag
-                v-for="(o, oindex) in row.ownerList"
-                :key="oindex"
-                class="cursor-pointer"
-                @click.native="toCientityView(o);"
-              >
-                {{ o.name }}
-              </Tag>
-            </div>
-            <div v-else></div>
-          </template>
-          <template v-slot:businessGroupList="{ row }">
-            <div v-if="!$utils.isEmpty(row.businessGroupList)">
-              <Tag
-                v-for="(b, bindex) in row.businessGroupList"
-                :key="bindex"
-                class="cursor-pointer"
-                @click.native="toCientityView(b)"
-              >
-                {{ b.name }}
-              </Tag>
-            </div>
-            <div v-else></div>
-          </template>
-          <template v-slot:state="{row}">
-            <!-- 资产状态 -->
-            <Tag
-              v-if="!$utils.isEmpty(row.state)"
-              class="cursor-pointer"
-              @click.native="toCientityView(row.state)"
-            >
-              {{ row.state.name }}
-            </Tag>
-          </template>
-          <template v-slot:dataCenter="{ row }">
-            <!-- 数据中心 -->
-            <Tag
-              v-if="!$utils.isEmpty(row.dataCenter)"
-              class="cursor-pointer"
-              @click.native="toCientityView(row.dataCenter)"
-            >
-              {{ row.dataCenter.name }}
-            </Tag>
-            <span v-else></span>
-          </template>
-          <template v-slot:ci="{row}">
-            <!-- 模型 -->
-            <div v-if="!$utils.isEmpty(row.ci)" class="text-href" @click="toCiView(row.ci)">
-              <span :class="row.ci.icon"></span>
-              <span>{{ row.ci.label }}</span>
-            </div>
-          </template>
-          <template v-slot:action="{row}">
-            <div class="tstable-action">
-              <ul class="tstable-action-ul">
-                <li v-if="row && row.jobPhaseNodeVo && row.jobPhaseNodeVo.jobId" class="tsfont-history" @click="toJobDetail(row)">{{ $t('term.inspect.jobdetail') }}</li>
-                <li v-auth="'INSPECT_EXECUTE'" class="tsfont-inspection" @click="doInspection(row)">{{ $t('term.inspect.inspect') }}</li>
-                <li class="tsfont-setting" @click="openRuleThresholdDialog(row)">{{ $t('term.inspect.thresholdrule') }}</li>
-              </ul>
-            </div>
-          </template>
-        </TsTable>
-      </div>
-    </div>
-    <NoData v-else></NoData>
-    <InspectionDialog
-      v-if="isShowInspectionDialog"
-      :ciEntityData="currentCiEntity"
-      @close="closeInspectionDialog"
-    ></InspectionDialog>
-    <RuleOfThresholdDialog
-      v-if="isShowRuleThresholdDialog"
-      :appSystemId="appSystemId"
-      :resourceId="resourceId"
-      @close="closeRuleOfThresholdDialog"
-    ></RuleOfThresholdDialog>
-  </div>
-</template>
-<script>
-export default {
-  name: '',
-  components: {
-    UserCard: () => import('@/resources/components/UserCard/UserCard.vue'),
-    TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
-    InspectionDialog: () => import('../assetsInspect/inspection-dialog.vue'), // 单个巡检
-    RuleOfThresholdDialog: () => import('./threshold/rule-of-threshold-dialog.vue'), //阈值规则
-    CommonStatus: () => import('@/resources/components/Status/CommonStatus.vue')
-    
-  },
-  filters: {},
-  props: {
-    appSystemId: {
-      type: Number,
-      default: null
-    },
-    appModuleId: {
-      type: Number,
-      default: null
-    },
-    moduleName: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      loadingShow: false,
-      isShowInspectionDialog: false,
-      isShowRuleThresholdDialog: false,
-      envId: '',
-      resourceId: null,
-      currentCiEntity: null,
-      envList: [],
-      tableList: [],
-      tableData: {
-        tbodyList: [],
-        rowNum: 0,
-        pageSize: 20,
-        currentPage: 1
-      }
-      // theadList: [
-      //   { key: 'ip', title: this.$t('page.ipaddress')},
-      //   { key: 'name', title: this.$t('page.name')},
-      //   { key: 'monitorStatus', title: this.$t('term.inspect.monitoringstate')},
-      //   { key: 'inspectStatus', title: this.$t('term.autoexec.inspectstatus')},
-      //   { key: 'stateName', title: this.$t('term.autoexec.assetstatus')},
-      //   { key: 'envName', title: this.$t('term.inspect.envname')},
-      //   { key: 'clusterName', title: this.$t('term.inspect.clustername')},
-      //   { key: 'dataCenterName', title: this.$t('term.inspect.datacenter')},
-      //   { key: 'networkArea', title: this.$t('page.networkarea')},
-      //   { key: 'ownerList', title: this.$t('page.owner')},
-      //   { key: 'bgList', title: this.$t('term.autoexec.subordinatedepartment')},
-      //   { key: 'maintenanceWindow', title: this.$t('term.deploy.maintenancewindow')},
-      //   { key: 'action'}
-      // ]
-    };
-  },
-  beforeCreate() {},
-  async created() {
-    await this.initData();
-  },
-  beforeMount() {},
-  mounted() {},
-  beforeUpdate() {},
-  updated() {},
-  activated() {},
-  deactivated() {},
-  beforeDestroy() {},
-  destroyed() {},
-  methods: {
-    toJobDetail(row) {
-      // 打开新的作业详情
-      if (row && row.jobPhaseNodeVo) {
-        window.open(HOME + '/inspect.html#/job-detail?id=' + row.jobPhaseNodeVo.jobId + '&status=' + row.jobPhaseNodeVo.status, '_blank');
-       
-        // this.$router.push({path: '/job-detail?id=' + row.jobPhaseNodeVo.jobId + '&status=' + row.jobPhaseNodeVo.status});
-      }
-    },
-    doInspection(row) {
-      // 巡检
-      this.isShowInspectionDialog = true;
-      if (row) {
-        this.currentCiEntity = row;
-      }
-    },
-    closeInspectionDialog() {
-      this.isShowInspectionDialog = false;
-      this.currentCiEntity = null;
-    },
-    restoreHistory(historyData) {
-      this.envId = historyData['envId'];
-    },
-    filterTypeFields(row) {
-      // 过滤类型字段，修复控制台报错问题
-      let currentRow = this.$utils.deepClone(row);
-      if (currentRow && currentRow.hasOwnProperty('type')) {
-        delete currentRow.type;
-      }
-      if (currentRow && currentRow.hasOwnProperty('theadList')) {
-        currentRow.theadList.push({
-          title: '',
-          key: 'action'
-        });
-      }
-      return currentRow;
-    },
-    changeCurrent(currentPage, item, index) {
-      this.tableData.currentPage = currentPage;
-      this.getTableData(item, index);
-    },
-    changePageSize(pageSize, item, index) {
-      this.tableData.pageSize = pageSize;
-      this.tableData.currentPage = 1;
-      this.getTableData(item, index);
-    },
-    async initData() {
-      this.tableData.currentPage = 1;
-      await this.getEnvList();
-      await this.getTableData();
-    },
-    async getEnvList() {
-      this.loadingShow = true;
-      await this.$api.cmdb.applicationManage.getEnvironmenteList().then(res => {
-        if (res.Status == 'OK') {
-          this.envList = res.Return?.tbodyList || [];
-          this.envList.unshift({
-            name: this.$t('term.inspect.allenv'),
-            id: ''
-          });
-          this.envList.push({
-            name: this.$t('term.inspect.noconfigenv'),
-            id: -2
-          });
-          this.envId = this.envId || '';
-        }
-      }).finally(() => {
-        this.loadingShow = false;
-      });
-    },
-    getTableData(row, index) {
-      let currentRow = {};
-      let params = {
-        appSystemId: this.appSystemId,
-        appModuleId: this.appModuleId,
-        envId: this.envId,
-        typeId: row && row.type ? row.type.id : null,
-        currentPage: this.tableData.currentPage,
-        pageSize: this.tableData.pageSize
-      };
-      this.$addHistoryData('envId', this.envId);
-      if (this.$utils.isEmpty(this.appSystemId) && this.$utils.isEmpty(this.appModuleId)) {
-        this.tableList = [];
-        return false;
-      }
-      this.loadingShow = true;
-      this.$api.inspect.applicationInspect.getNewapplicationInspectList(params).then(res => {
-        if (res.Status == 'OK') {
-          if (row && !this.$utils.isEmptyObj(row)) {
-            // 内嵌列表翻页
-            let tableList = (res.Return && res.Return.tableList) ? res.Return.tableList[0] : [];
-            currentRow = Object.assign({}, row, tableList);
-            this.$set(this.tableList, index, currentRow);
-          } else {
-            this.tableList = res.Return.tableList;
-          }
-        }
-      }).finally(() => {
-        this.loadingShow = false;
-      });
-    },
-    toCientityView(row) {
-      // 应用清单详情
-      if (row && !this.$utils.isEmptyObj(row)) {
-        window.open(HOME + '/inspect.html#/ci/' + row.ciId + '/cientity-view/' + row.id, '_blank');
-      
-        // this.$router.push({ path: './ci/' + row.typeId + '/cientity-view/' + row.id });
-      }
-    },
-    toInspectStatusDetail(row) {
-      // 巡检状态详情
-      if (row && !this.$utils.isEmptyObj(row)) {
-        window.open(HOME + '/inspect.html#/assets-detail-' + row.id, '_blank');
-      }
-    },
-    gotoDetails(row) {
-      window.open(HOME + '/inspect.html#/assets-detail-' + row.id, '_blank');
-    },
-    toGlobalAttrManage() {
-      //全局属性管理
-      window.open(HOME + '/cmdb.html#/global-attr-manage', '_blank');
-    },
-    toCiView(ci) {
-      if (ci && !this.$utils.isEmptyObj(ci)) {
-        window.open(HOME + '/cmdb.html#/ci-view/' + ci.id, '_blank');
-      }
-    },
-    selectedEnv(name) {
-      let envId = null;
-      this.envList.forEach(v => {
-        if (v.name == name) {
-          envId = v.id;
-        }
-      });
-      this.envId = envId;
-      this.tableData.currentPage = 1;
-      this.getTableData();
-    },
-    handleTimes(time) {
-      let data = '-';
-      if (time) {
-        data = Date.parse(new Date()) - time;
-      }
-      return data;
-    },
-    openRuleThresholdDialog(row) {
-      if (row && row.id) {
-        this.resourceId = row.id;
-        this.isShowRuleThresholdDialog = true;
-      }
-    },
-    closeRuleOfThresholdDialog() {
-      this.isShowRuleThresholdDialog = false;
-    }
-  },
-  computed: {},
-  watch: {
-    appSystemId() {
-      this.initData();
-    },
-    appModuleId() {
-      this.initData();
-    }
-  }
-};
-</script>
-<style lang="less" scoped>
-.inspection-assets-manage-wrap {
-  .li-box {
-    margin-bottom: -10px;
-  .li-item {
-    padding: 6px 16px;
-    border-radius: 4px;
-    text-align: center;
-    margin-bottom: 10px;
-  }
- }
-}
-
-</style>
+<template>
+  <div class="inspection-assets-manage-wrap padding">
+    <Loading :loadingShow="loadingShow" type="fix"></Loading>
+    <div v-if="envList && envList.length > 0" class="pb-sm li-box">
+      <Row :gutter="16">
+        <Col
+          v-for="item in envList"
+          :key="item.id"
+          :xs="12"
+          :sm="8"
+          :md="6"
+          :lg="4"
+          :xl="3"
+          :xxl="2"
+        >
+          <div
+            v-if="item.name"
+            class="li-item text-action"
+            :class="envId == item.id ? 'li-active li-text border-primary' : 'border-base bg-op'"
+            @click="selectedEnv(item.name)"
+          >{{ item.name }}</div>
+        </Col>
+      </Row>
+    </div>
+    <div v-if="tableList && tableList.length > 0 ">
+      <div v-for="(item, index) in tableList" :key="index">
+        <div class="h3 padding-sm">{{ item.viewLabel }}</div>
+        <TsTable
+          v-bind="filterTypeFields(item)"
+          @changeCurrent="(currentPage) => changeCurrent(currentPage, item, index)"
+          @changePageSize="(pageSize) => changePageSize(pageSize,item, index)"
+        >
+          <template v-slot:ip="{ row }">
+            <span class="text-href" @click.stop="gotoDetails(row)">
+              <span>{{ row.ip.ip }}</span>
+              <span v-if="row.ip.port">:{{ row.ip.port }}</span>
+            </span>
+          </template>
+          <template v-slot:allIpList="{ row }">
+            <div v-if="!$utils.isEmpty(row.allIpList)">
+              <Tag
+                v-for="(v, vindex) in row.allIpList"
+                :key="vindex"
+                class="cursor-pointer"
+                @click.native="toCientityView(v)"
+              >
+                {{ v.name }}
+              </Tag>
+            </div>
+            <div v-else></div>
+          </template>
+          <template v-slot:lcu="{row}">
+            <UserCard v-bind="row.lcu" :hideAvatar="true"></UserCard>
+          </template>
+          <template v-slot:lcd="{ row }">
+            <div v-if="row.lcd">{{ row.lcd | formatDate }}</div>
+          </template>
+          <template v-slot:fcu="{ row }">
+            <UserCard v-bind="row.fcu" :hideAvatar="true"></UserCard>
+          </template>
+          <template v-slot:fcd="{ row }">
+            <div v-if="row.fcd">{{ row.fcd | formatDate }}</div>
+          </template>
+          <template v-slot:monitor="{ row }">
+            <!-- 监控状态 -->
+            <span v-if="row.monitor && row.monitor.time" :title="row.monitor.time | formatDate">
+              <span :class="[row.monitor.cssClass, {'background-FATAL': row.monitor.value== 'FATAL'}]" class="vertical">{{ row.monitor.text }} </span>
+              <span class="text-title">
+                {{ handleTimes(row.monitor.time) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
+              </span>
+            </span>
+            <span v-else></span>
+          </template>
+          <template v-slot:inspect="{ row }">
+            <!-- 巡检状态 -->
+            <span v-if="row.inspect && row.inspect.time" :title="row.inspect.time | formatDate">
+              <span :class="[row.inspect.cssClass, {'background-FATAL': row.inspect.value== 'FATAL'}]" class="vertical cursor" @click="toInspectStatusDetail(row)">{{ row.inspect.text }} </span>
+              <span class="text-title">
+                {{ handleTimes(row.inspect.time) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
+              </span>
+            </span>
+            <span v-else>
+              <span>-</span>
+            </span>
+          </template>
+          <template v-slot:taskStatus="{ row }">
+            <CommonStatus
+              v-if="row.taskStatus"
+              :statusName="row.taskStatus.text"
+              :statusValue="row.taskStatus.value"
+              type="text"
+            ></CommonStatus>
+            <span v-else>-</span>
+          </template>
+          <template v-slot:vendor="{ row }">
+            <Tag
+              v-if="!$utils.isEmpty(row.vendor)"
+              class="cursor-pointer"
+              @click.native="toCientityView(row.vendor)"
+            >
+              {{ row.vendor.name }}
+            </Tag>
+            <span v-else></span>
+          </template>
+          <template v-slot:appModule="{ row }">
+            <div v-if="!$utils.isEmpty(row.appModule)" class="text-href" @click="toCientityView(row.appModule)">
+              <span :class="row.appModule.ciIcon"></span>
+              <span>{{ row.appModule.name }}</span>
+            </div>
+          </template>
+          <template v-slot:appEnvironment="{ row }">
+            <Tag
+              v-if="!$utils.isEmpty(row.appEnvironment)"
+              class="cursor-pointer"
+              @click.native="toGlobalAttrManage()"
+            >
+              {{ row.appEnvironment.value }}
+            </Tag>
+          </template>
+          <template v-slot:appSystem="{row}">
+            <!-- 应用系统 -->
+            <div v-if="!$utils.isEmpty(row.appSystem)" class="text-href" @click="toCientityView(row.appSystem)">
+              <span :class="row.appSystem.ciIcon"></span>
+              <span>{{ row.appSystem.name }}</span>
+            </div>
+          </template>
+          <template v-slot:ownerList="{ row }">
+            <div v-if="!$utils.isEmpty(row.ownerList)">
+              <Tag
+                v-for="(o, oindex) in row.ownerList"
+                :key="oindex"
+                class="cursor-pointer"
+                @click.native="toCientityView(o);"
+              >
+                {{ o.name }}
+              </Tag>
+            </div>
+            <div v-else></div>
+          </template>
+          <template v-slot:businessGroupList="{ row }">
+            <div v-if="!$utils.isEmpty(row.businessGroupList)">
+              <Tag
+                v-for="(b, bindex) in row.businessGroupList"
+                :key="bindex"
+                class="cursor-pointer"
+                @click.native="toCientityView(b)"
+              >
+                {{ b.name }}
+              </Tag>
+            </div>
+            <div v-else></div>
+          </template>
+          <template v-slot:state="{row}">
+            <!-- 资产状态 -->
+            <Tag
+              v-if="!$utils.isEmpty(row.state)"
+              class="cursor-pointer"
+              @click.native="toCientityView(row.state)"
+            >
+              {{ row.state.name }}
+            </Tag>
+          </template>
+          <template v-slot:dataCenter="{ row }">
+            <!-- 数据中心 -->
+            <Tag
+              v-if="!$utils.isEmpty(row.dataCenter)"
+              class="cursor-pointer"
+              @click.native="toCientityView(row.dataCenter)"
+            >
+              {{ row.dataCenter.name }}
+            </Tag>
+            <span v-else></span>
+          </template>
+          <template v-slot:ci="{row}">
+            <!-- 模型 -->
+            <div v-if="!$utils.isEmpty(row.ci)" class="text-href" @click="toCiView(row.ci)">
+              <span :class="row.ci.icon"></span>
+              <span>{{ row.ci.label }}</span>
+            </div>
+          </template>
+          <template v-slot:action="{row}">
+            <div class="tstable-action">
+              <ul class="tstable-action-ul">
+                <li v-if="row && row.jobPhaseNodeVo && row.jobPhaseNodeVo.jobId" class="tsfont-history" @click="toJobDetail(row)">{{ $t('term.inspect.jobdetail') }}</li>
+                <li v-auth="'INSPECT_EXECUTE'" class="tsfont-inspection" @click="doInspection(row)">{{ $t('term.inspect.inspect') }}</li>
+                <li class="tsfont-setting" @click="openRuleThresholdDialog(row)">{{ $t('term.inspect.thresholdrule') }}</li>
+              </ul>
+            </div>
+          </template>
+        </TsTable>
+      </div>
+    </div>
+    <NoData v-else></NoData>
+    <InspectionDialog
+      v-if="isShowInspectionDialog"
+      :ciEntityData="currentCiEntity"
+      @close="closeInspectionDialog"
+    ></InspectionDialog>
+    <RuleOfThresholdDialog
+      v-if="isShowRuleThresholdDialog"
+      :appSystemId="appSystemId"
+      :resourceId="resourceId"
+      @close="closeRuleOfThresholdDialog"
+    ></RuleOfThresholdDialog>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    UserCard: () => import('@/resources/components/UserCard/UserCard.vue'),
+    TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
+    InspectionDialog: () => import('../assetsInspect/inspection-dialog.vue'), // 单个巡检
+    RuleOfThresholdDialog: () => import('./threshold/rule-of-threshold-dialog.vue'), //阈值规则
+    CommonStatus: () => import('@/resources/components/Status/CommonStatus.vue')
+    
+  },
+  filters: {},
+  props: {
+    appSystemId: {
+      type: Number,
+      default: null
+    },
+    appModuleId: {
+      type: Number,
+      default: null
+    },
+    moduleName: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      loadingShow: false,
+      isShowInspectionDialog: false,
+      isShowRuleThresholdDialog: false,
+      envId: '',
+      resourceId: null,
+      currentCiEntity: null,
+      envList: [],
+      tableList: [],
+      tableData: {
+        tbodyList: [],
+        rowNum: 0,
+        pageSize: 20,
+        currentPage: 1
+      }
+      // theadList: [
+      //   { key: 'ip', title: this.$t('page.ipaddress')},
+      //   { key: 'name', title: this.$t('page.name')},
+      //   { key: 'monitorStatus', title: this.$t('term.inspect.monitoringstate')},
+      //   { key: 'inspectStatus', title: this.$t('term.autoexec.inspectstatus')},
+      //   { key: 'stateName', title: this.$t('term.autoexec.assetstatus')},
+      //   { key: 'envName', title: this.$t('term.inspect.envname')},
+      //   { key: 'clusterName', title: this.$t('term.inspect.clustername')},
+      //   { key: 'dataCenterName', title: this.$t('term.inspect.datacenter')},
+      //   { key: 'networkArea', title: this.$t('page.networkarea')},
+      //   { key: 'ownerList', title: this.$t('page.owner')},
+      //   { key: 'bgList', title: this.$t('term.autoexec.subordinatedepartment')},
+      //   { key: 'maintenanceWindow', title: this.$t('term.deploy.maintenancewindow')},
+      //   { key: 'action'}
+      // ]
+    };
+  },
+  beforeCreate() {},
+  async created() {
+    await this.initData();
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    toJobDetail(row) {
+      // 打开新的作业详情
+      if (row && row.jobPhaseNodeVo) {
+        window.open(HOME + '/inspect.html#/job-detail?id=' + row.jobPhaseNodeVo.jobId + '&status=' + row.jobPhaseNodeVo.status, '_blank');
+       
+        // this.$router.push({path: '/job-detail?id=' + row.jobPhaseNodeVo.jobId + '&status=' + row.jobPhaseNodeVo.status});
+      }
+    },
+    doInspection(row) {
+      // 巡检
+      this.isShowInspectionDialog = true;
+      if (row) {
+        this.currentCiEntity = row;
+      }
+    },
+    closeInspectionDialog() {
+      this.isShowInspectionDialog = false;
+      this.currentCiEntity = null;
+    },
+    restoreHistory(historyData) {
+      this.envId = historyData['envId'];
+    },
+    filterTypeFields(row) {
+      // 过滤类型字段，修复控制台报错问题
+      let currentRow = this.$utils.deepClone(row);
+      if (currentRow && currentRow.hasOwnProperty('type')) {
+        delete currentRow.type;
+      }
+      if (currentRow && currentRow.hasOwnProperty('theadList')) {
+        currentRow.theadList.push({
+          title: '',
+          key: 'action'
+        });
+      }
+      return currentRow;
+    },
+    changeCurrent(currentPage, item, index) {
+      this.tableData.currentPage = currentPage;
+      this.getTableData(item, index);
+    },
+    changePageSize(pageSize, item, index) {
+      this.tableData.pageSize = pageSize;
+      this.tableData.currentPage = 1;
+      this.getTableData(item, index);
+    },
+    async initData() {
+      this.tableData.currentPage = 1;
+      await this.getEnvList();
+      await this.getTableData();
+    },
+    async getEnvList() {
+      this.loadingShow = true;
+      await this.$api.cmdb.applicationManage.getEnvironmenteList().then(res => {
+        if (res.Status == 'OK') {
+          this.envList = res.Return?.tbodyList || [];
+          this.envList.unshift({
+            name: this.$t('term.inspect.allenv'),
+            id: ''
+          });
+          this.envList.push({
+            name: this.$t('term.inspect.noconfigenv'),
+            id: -2
+          });
+          this.envId = this.envId || '';
+        }
+      }).finally(() => {
+        this.loadingShow = false;
+      });
+    },
+    getTableData(row, index) {
+      let currentRow = {};
+      let params = {
+        appSystemId: this.appSystemId,
+        appModuleId: this.appModuleId,
+        envId: this.envId,
+        typeId: row && row.type ? row.type.id : null,
+        currentPage: this.tableData.currentPage,
+        pageSize: this.tableData.pageSize
+      };
+      this.$addHistoryData('envId', this.envId);
+      if (this.$utils.isEmpty(this.appSystemId) && this.$utils.isEmpty(this.appModuleId)) {
+        this.tableList = [];
+        return false;
+      }
+      this.loadingShow = true;
+      this.$api.inspect.applicationInspect.getNewapplicationInspectList(params).then(res => {
+        if (res.Status == 'OK') {
+          if (row && !this.$utils.isEmptyObj(row)) {
+            // 内嵌列表翻页
+            let tableList = (res.Return && res.Return.tableList) ? res.Return.tableList[0] : [];
+            currentRow = Object.assign({}, row, tableList);
+            this.$set(this.tableList, index, currentRow);
+          } else {
+            this.tableList = res.Return.tableList;
+          }
+        }
+      }).finally(() => {
+        this.loadingShow = false;
+      });
+    },
+    toCientityView(row) {
+      // 应用清单详情
+      if (row && !this.$utils.isEmptyObj(row)) {
+        window.open(HOME + '/inspect.html#/ci/' + row.ciId + '/cientity-view/' + row.id, '_blank');
+      
+        // this.$router.push({ path: './ci/' + row.typeId + '/cientity-view/' + row.id });
+      }
+    },
+    toInspectStatusDetail(row) {
+      // 巡检状态详情
+      if (row && !this.$utils.isEmptyObj(row)) {
+        window.open(HOME + '/inspect.html#/assets-detail-' + row.id, '_blank');
+      }
+    },
+    gotoDetails(row) {
+      window.open(HOME + '/inspect.html#/assets-detail-' + row.id, '_blank');
+    },
+    toGlobalAttrManage() {
+      //全局属性管理
+      window.open(HOME + '/cmdb.html#/global-attr-manage', '_blank');
+    },
+    toCiView(ci) {
+      if (ci && !this.$utils.isEmptyObj(ci)) {
+        window.open(HOME + '/cmdb.html#/ci-view/' + ci.id, '_blank');
+      }
+    },
+    selectedEnv(name) {
+      let envId = null;
+      this.envList.forEach(v => {
+        if (v.name == name) {
+          envId = v.id;
+        }
+      });
+      this.envId = envId;
+      this.tableData.currentPage = 1;
+      this.getTableData();
+    },
+    handleTimes(time) {
+      let data = '-';
+      if (time) {
+        data = Date.parse(new Date()) - time;
+      }
+      return data;
+    },
+    openRuleThresholdDialog(row) {
+      if (row && row.id) {
+        this.resourceId = row.id;
+        this.isShowRuleThresholdDialog = true;
+      }
+    },
+    closeRuleOfThresholdDialog() {
+      this.isShowRuleThresholdDialog = false;
+    }
+  },
+  computed: {},
+  watch: {
+    appSystemId() {
+      this.initData();
+    },
+    appModuleId() {
+      this.initData();
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+.inspection-assets-manage-wrap {
+  .li-box {
+    margin-bottom: -10px;
+  .li-item {
+    padding: 6px 16px;
+    border-radius: 4px;
+    text-align: center;
+    margin-bottom: 10px;
+  }
+ }
+}
+
+</style>
diff --git a/src/views/pages/inspect/applicationNew/latest-questions-manage.vue b/src/views/pages/inspect/applicationNew/latest-questions-manage.vue
index 2df0dd576..7d9d840ad 100644
--- a/src/views/pages/inspect/applicationNew/latest-questions-manage.vue
+++ b/src/views/pages/inspect/applicationNew/latest-questions-manage.vue
@@ -1,720 +1,719 @@
-<template>
-  <div class="latest-question-manage-box padding">
-    2
-    <Loading :loadingShow="loadingShow" type="fix"></Loading>
-    <div class="action-group text-right pb-sm">
-      <span :class="isExpandCollapse ? 'tsfont-up' : 'tsfont-down'" class="action-item" @click="handleExpandCollapseAll()">
-        <span v-if="isExpandCollapse">{{ $t('page.packup') }}</span>
-        <span v-else>{{ $t('page.expand') }}</span>
-      </span>
-      <span class="action-item tsfont-rotate-right" @click="handleRefresh()">{{ $t('page.refresh') }}</span>
-      <span v-if="!downloadLoading" v-download="downloadUrl" class="action-item tsfont-download">{{ $t('page.export') }}</span>
-      <span v-if="downloadLoading" class="action-item disable" :title="$t('page.downloadloadingtip')">
-        <Icon type="ios-loading" size="18" class="loading icon-right"></Icon>
-        {{ $t('page.export') }}
-      </span>
-      <span class="action-item tsfont-mail-unread-o" @click="sendEmail">{{ $t('page.mail') }}</span>
-    </div>
-    <div v-if="envList && envList.length > 0" class="li-box">
-      <Row :gutter="16">
-        <Col
-          v-for="item in envList"
-          :key="item.id"
-          :xs="12"
-          :sm="8"
-          :md="6"
-          :lg="4"
-          :xl="3"
-          :xxl="2"
-        >
-          <div
-            v-if="item.name"
-            class="li-item text-action"
-            :class="envId == item.id ? 'li-active li-text border-primary' : 'border-base bg-op'"
-            @click="selectedEnv(item.name)"
-          >{{ item.name }}</div>
-        </Col>
-      </Row>
-    </div>
-    <div v-if="tableList && tableList.length > 0 ">
-      <div v-for="(item, tIndex) in tableList" :key="tIndex">
-        <div class="h3 padding-sm">{{ item.viewLabel }}</div>
-        <div>
-          <TsTable
-            v-if="!loadingShow"
-            v-bind="filterTypeFields(item)"
-            :fixedHeader="false"
-            keyName="id"
-            canExpand
-            class="inner-table"
-            @changeCurrent="(currentPage) => changeCurrent(currentPage, item, tIndex)"
-            @changePageSize="(pageSize) => changePageSize(pageSize, item, tIndex)"
-          >
-            <template v-slot:ip="{ row }">
-              <span class="text-href" @click.stop="toAssetsDetail(row)">
-                <span>{{ row.ip.ip }}</span>
-                <span v-if="row.ip.port">:{{ row.ip.port }}</span>
-              </span>
-            </template>
-            <template v-slot:allIpList="{ row }">
-              <div v-if="!$utils.isEmpty(row.allIpList)">
-                <Tag
-                  v-for="(v, vindex) in row.allIpList"
-                  :key="vindex"
-                  class="cursor-pointer"
-                  @click.native="toCientityView(v)"
-                >
-                  {{ v.name }}
-                </Tag>
-              </div>
-              <div v-else></div>
-            </template>
-            <template v-slot:monitor="{ row }">
-              <!-- 监控状态 -->
-              <span v-if="row.monitor && row.monitor.time" :title="row.monitor.time | formatDate">
-                <span :class="[row.monitor.cssClass, {'background-FATAL': row.monitor.value== 'FATAL'}]" class="vertical">{{ row.monitor.text }} </span>
-                <span class="text-title">
-                  {{ handleTime(row.monitor.time) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
-                </span>
-              </span>
-              <span v-else>
-                <span>-</span>
-              </span>
-            </template>
-            <template v-slot:taskStatus="{ row }">
-              <CommonStatus
-                v-if="row.taskStatus"
-                :statusName="row.taskStatus.text"
-                :statusValue="row.taskStatus.value"
-                type="text"
-              ></CommonStatus>
-              <span v-else>-</span>
-            </template>
-            <template v-slot:inspect="{ row }">
-              <!-- 巡检状态 -->
-              <span v-if="row.inspect && row.inspect.time" :title="row.inspect.time | formatDate">
-                <span :class="[row.inspect.cssClass, {'background-FATAL': row.inspect.value== 'FATAL'}]" class="vertical cursor" @click="toAssetsDetail(row)">{{ row.inspect.text }} </span>
-                <span class="text-title">
-                  {{ handleTime(row.inspect.time) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
-                </span>
-              </span>
-              <span v-else>
-                <span>-</span>
-              </span>
-            </template>
-            <template v-slot:lcu="{row}">
-              <UserCard v-bind="row.lcu" :hideAvatar="true"></UserCard>
-            </template>
-            <template v-slot:lcd="{ row }">
-              <div v-if="row.lcd">{{ row.lcd | formatDate }}</div>
-            </template>
-            <template v-slot:fcu="{ row }">
-              <UserCard v-bind="row.fcu" :hideAvatar="true"></UserCard>
-            </template>
-            <template v-slot:fcd="{ row }">
-              <div v-if="row.fcd">{{ row.fcd | formatDate }}</div>
-            </template>
-            
-            <template v-slot:vendor="{ row }">
-              <!-- 厂商 -->
-              <Tag
-                v-if="!$utils.isEmpty(row.vendor)"
-                class="cursor-pointer"
-                @click.native="toCientityView(row.vendor)"
-              >
-                {{ row.vendor.name }}
-              </Tag>
-              <span v-else></span>
-            </template>
-            <template v-slot:appSystem="{row}">
-              <!-- 应用系统 -->
-              <div v-if="!$utils.isEmpty(row.appSystem)" class="text-href" @click="toCientityView(row.appSystem)">
-                <span :class="row.appSystem.ciIcon"></span>
-                <span>{{ row.appSystem.name }}</span>
-              </div>
-            </template>
-            <template v-slot:appModule="{ row }">
-              <!-- 应用模块 -->
-              <div v-if="!$utils.isEmpty(row.appModule)" class="text-href" @click="toCientityView(row.appModule)">
-                <span :class="row.appModule.ciIcon"></span>
-                <span>{{ row.appModule.name }}</span>
-              </div>
-            </template>
-            <template v-slot:appEnvironment="{ row }">
-              <!-- 环境 -->
-              <Tag
-                v-if="!$utils.isEmpty(row.appEnvironment)"
-                class="cursor-pointer"
-                @click.native="toGlobalAttrManage()"
-              >
-                {{ row.appEnvironment.value }}
-              </Tag>
-            </template>
-            <template v-slot:state="{row}">
-              <!-- 资产状态 -->
-              <Tag
-                v-if="!$utils.isEmpty(row.state)"
-                class="cursor-pointer"
-                @click.native="toCientityView(row.state)"
-              >
-                {{ row.state.name }}
-              </Tag>
-            </template>
-            <template v-slot:ownerList="{ row }">
-              <div v-if="!$utils.isEmpty(row.ownerList)">
-                <Tag
-                  v-for="(o, oindex) in row.ownerList"
-                  :key="oindex"
-                  class="cursor-pointer"
-                  @click.native="toCientityView(o);"
-                >
-                  {{ o.name }}
-                </Tag>
-              </div>
-              <div v-else></div>
-            </template>
-            <template v-slot:businessGroupList="{ row }">
-              <div v-if="!$utils.isEmpty(row.businessGroupList)">
-                <Tag
-                  v-for="(b, bindex) in row.businessGroupList"
-                  :key="bindex"
-                  class="cursor-pointer"
-                  @click.native="toCientityView(b)"
-                >
-                  {{ b.name }}
-                </Tag>
-              </div>
-              <div v-else></div>
-            </template>
-            <template v-slot:ci="{row}">
-              <!-- 模型 -->
-              <div v-if="!$utils.isEmpty(row.ci)" class="text-href" @click="toCiView(row.ci)">
-                <span :class="row.ci.icon"></span>
-                <span>{{ row.ci.label }}</span>
-              </div>
-            </template>
-            <template v-slot:dataCenter="{ row }">
-              <!-- 数据中心 -->
-              <Tag
-                v-if="!$utils.isEmpty(row.dataCenter)"
-                class="cursor-pointer"
-                @click.native="toCientityView(row.dataCenter)"
-              >
-                {{ row.dataCenter.name }}
-              </Tag>
-              <span v-else></span>
-            </template>
-            <template v-slot:expandCollapseArrow="{ row ,index}">
-              <span :class="{ 'tsfont-right': !row._expand, 'tsfont-down open': row._expand }" class="table-icon" @click.stop="openInnerTable(row, tIndex, index)"></span>
-            </template>
-            <template v-slot:expand="{ row }">
-              <ExpandTable v-if="row._expand" style="margin-left: 40px;" :inspectResultList="getInnerTbodyList(row.inspectResult)"></ExpandTable>
-            </template>
-            <template v-slot:action="{ row }">
-              <div class="tstable-action">
-                <ul class="tstable-action-ul">
-                  <li class="tsfont-setting" @click="openRuleThresholdDialog(row)">{{ $t('term.inspect.thresholdrule') }}</li>
-                  <li v-if="row && row.jobPhaseNodeVo && row.jobPhaseNodeVo.jobId" class="tsfont-history" @click="toJobDetail(row)">{{ $t('term.inspect.jobdetail') }}</li>
-                  <li v-if="row.ip" class="tsfont-ci" @click="toCientityView(row.ip)">{{ $t('term.cmdb.viewcientity') }}</li>
-                </ul>
-              </div>
-            </template>
-          </TsTable>
-        </div>
-      </div>
-    </div>
-    <NoData v-else></NoData>
-    <SendEmail
-      v-if="isShowSendEmail"
-      :params="{
-        isNeedAlertDetail: 1,
-        appSystemId: appSystemId,
-        inspectStatusList: inspectStatusList
-      }"
-      @closeSendEmailDialog="closeSendEmailDialog"
-    ></SendEmail>
-    <RuleOfThresholdDialog
-      v-if="isShowRuleThresholdDialog"
-      :appSystemId="appSystemId"
-      :resourceId="resourceId"
-      @close="closeRuleOfThresholdDialog"
-    ></RuleOfThresholdDialog>
-  </div>
-</template>
-<script>
-import download from '@/resources/directives/download.js';
-export default {
-  name: '',
-  components: {
-    UserCard: () => import('@/resources/components/UserCard/UserCard.vue'),
-    TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
-    CommonStatus: () => import('@/resources/components/Status/CommonStatus.vue'),
-    ExpandTable: () => import('@/views/pages/inspect/recentIssues/component/expand-table.vue'),
-    SendEmail: () => import('@/views/pages/inspect/recentIssues/component/send-email.vue'),
-    RuleOfThresholdDialog: () => import('./threshold/rule-of-threshold-dialog.vue')
-  },
-  directives: { download },
-  props: {
-    appSystemId: {
-      // 应用Id
-      type: Number,
-      default: null
-    },
-    appModuleId: {
-      // 模块Id
-      type: Number,
-      default: null
-    }
-  },
-  data() {
-    return {
-      loadingShow: true,
-      isExpandCollapse: true, // 处理展开收起，默认展开
-      isShowSendEmail: false,
-      downloadLoading: false,
-      isShowRuleThresholdDialog: false,
-      typeName: '',
-      envId: null, // 环境ID
-      envList: [], // 环境列表
-      expandCollapseIdList: [], // 展开收起Id列表，下榻页面，返回显示用
-      isBack: false,
-      tableList: [],
-      tableConfig: {
-        tbodyList: [],
-        pageSize: 20,
-        currentPage: 1,
-        rowNum: null
-      }
-      // theadList: [
-      //   {
-      //     title: '',
-      //     key: 'expandCollapseArrow' // 展开收起箭头
-      //   },
-      //   {
-      //     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: this.$t('term.inspect.inspectionjobstatus'),
-      //     key: 'taskStatus'
-      //   },
-      //   {
-      //     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: '',
-      //     key: 'action'
-      //   }
-      // ]
-    };
-  },
-  beforeCreate() {},
-  created() {},
-  beforeMount() {},
-  mounted() {
-    this.initData();
-  },
-  beforeUpdate() {},
-  updated() {},
-  activated() {},
-  deactivated() {},
-  beforeDestroy() {},
-  destroyed() {},
-  methods: {
-    async initData() {
-      this.tableConfig.currentPage = 1;
-      await this.getEnvList();
-      await this.getInspectStatusList();
-      await this.getTableData();
-    },
-    async getEnvList() {
-      await this.$api.cmdb.applicationManage.getEnvironmenteList().then(res => {
-        if (res.Status == 'OK') {
-          this.envList = res.Return?.tbodyList || [];
-          this.envList.unshift({
-            name: this.$t('term.inspect.allenv'),
-            id: ''
-          });
-          this.envList.push({
-            name: this.$t('term.inspect.noconfigenv'),
-            id: -2
-          });
-          this.envId = this.envId || ''; // 有环境id，就取环境ID的值，否则默认选择所有环境（用于下榻页面返回）
-        }
-      });
-    },
-    async getInspectStatusList() {
-      // 获取巡检状态列表
-      this.inspectStatusList = [];
-      await this.$api.common.getSelectList({enumClass: 'InspectStatus'}).then((res) => {
-        if (res.Status == 'OK') {
-          let nodeList = res.Return || [];
-          if (nodeList && nodeList.length > 0) {
-            nodeList.forEach(item => {
-              if (item && item.value != 'normal') {
-                this.inspectStatusList.push(item.value);
-              }
-            });
-          }
-        }
-      });
-    },
-    getTableData(row, index) {
-      //获取表格数据
-      let params = {
-        appSystemId: this.appSystemId,
-        appModuleId: this.appModuleId,
-        envId: this.envId,
-        inspectStatusList: this.inspectStatusList,
-        currentPage: this.tableConfig.currentPage,
-        pageSize: this.tableConfig.pageSize
-      };
-      this.$addHistoryData('isExpandCollapse', this.isExpandCollapse);
-      this.$addHistoryData('expandCollapseIdList', this.expandCollapseIdList);
-      this.$addHistoryData('envId', this.envId);
-      this.loadingShow = true;
-      this.$api.inspect.applicationInspect.getNewapplicationInspectList(params).then(res => {
-        if (res.Status == 'OK') {
-          if (row && !this.$utils.isEmptyObj(row)) {
-            // 内嵌列表翻页
-            let tableList = (res.Return && res.Return.tableList) ? ((res.Return.tableList.length > index) ? res.Return.tableList[index] : res.Return.tableList[0]) : [];
-            let currentRow = Object.assign({}, row, tableList);
-            this.tableConfig.pageSize = tableList ? tableList.pageSize : 20;
-            this.tableConfig.currentPage = tableList ? tableList.currentPage : 1;
-            this.$set(this.tableList, index, currentRow);
-          } else {
-            this.tableList = res.Return ? res.Return.tableList : [];
-            this.tableConfig.pageSize = 20;
-            this.tableConfig.currentPage = 1;
-          }
-          let resourceIdList = [];
-          if (this.tableList && !this.$utils.isEmpty(this.tableList)) {
-            this.tableList.forEach(item => {
-              if (item && item.tbodyList && !this.$utils.isEmpty(item.tbodyList)) {
-                item.tbodyList.forEach((v) => {
-                  if (v && v.id) {
-                    resourceIdList.push(v.id);
-                  }
-                });
-              }
-            });
-          }
-          if (this.$utils.isEmpty(this.expandCollapseIdList) && this.isExpandCollapse) {
-            // 首次需要把id存起来，下榻页面返回需要使用
-            this.expandCollapseIdList = resourceIdList;
-            this.$addHistoryData('expandCollapseIdList', this.expandCollapseIdList);
-          }
-          this.getInnerTableList(resourceIdList); // 获取内嵌表格数据
-        }
-      }).catch(() => {
-        this.loadingShow = false;
-      });
-    },
-    getInnerTableList(resourceIdList) {
-      // 获取内嵌表格数据
-      this.loadingShow = true;
-      if (resourceIdList && !this.$utils.isEmpty(resourceIdList)) {
-        this.$api.inspect.inspectJob.getRecentIssuesInnerTableList({ resourceIdList: resourceIdList }).then(res => {
-          if (res.Status == 'OK') {
-            let obj = res.Return;
-            this.tableList.forEach(item => {
-              if (item && item.tbodyList && !this.$utils.isEmpty(item.tbodyList)) {
-                item.tbodyList.forEach((v) => {
-                  Object.keys(obj).forEach(n => {
-                    if (v.id == n) {
-                      this.$set(v, 'inspectResult', obj[n] ? Object.values(obj[n]) : []);
-                    }
-                  });
-                });
-              }
-            });
-            if (this.tableList && !this.$utils.isEmpty(this.tableList)) {
-              this.tableList.forEach(val => {
-                if (val && val.tbodyList && !this.$utils.isEmpty(val.tbodyList)) {
-                  val.tbodyList.forEach((v) => {
-                    if (v && v.hasOwnProperty('inspectResult') && !this.$utils.isEmpty(v.inspectResult)) {
-                      if (this.isBack) { // 下榻页面返回，恢复之前展开收起状态
-                        v['_expand'] = !this.$utils.isEmpty(this.expandCollapseIdList) ? this.expandCollapseIdList.includes(v.id) : this.isExpandCollapse;
-                      } else {
-                        v['_expand'] = this.isExpandCollapse;
-                      }
-                    }
-                  });
-                }
-              });
-            }
-          }
-        }).finally(() => {
-          this.loadingShow = false;
-        });
-      } else {
-        this.loadingShow = false;
-      }
-    },
-    changeCurrent(currentPage, item, index) {
-      this.tableConfig.currentPage = currentPage;
-      this.getTableData(item, index);
-    },
-    changePageSize(pageSize, item, index) {
-      this.tableConfig.pageSize = pageSize;
-      this.tableConfig.currentPage = 1;
-      this.getTableData(item, index);
-    },
-    restoreHistory(historyData) {
-      // 下榻页面，返回搜索条件保持一致
-      this.isBack = true;
-      this.envId = historyData['envId'];
-      this.expandCollapseIdList = historyData['expandCollapseIdList'];
-      this.isExpandCollapse = historyData['isExpandCollapse'];
-    },
-    selectedEnv(name) {
-      let envId = null;
-      this.envList.forEach(v => {
-        if (v.name == name) {
-          envId = v.id;
-        }
-      });
-      this.envId = envId;
-      this.tableConfig.currentPage = 1;
-      this.getTableData();
-    },
-    filterTypeFields(row) {
-      // 过滤类型字段，修复控制台报错问题
-      let currentRow = this.$utils.deepClone(row);
-      if (currentRow && currentRow.hasOwnProperty('type')) {
-        delete currentRow.type;
-      }
-      if (currentRow && currentRow.hasOwnProperty('theadList')) {
-        currentRow.theadList.unshift({
-          title: '',
-          key: 'expandCollapseArrow' // 展开收起箭头
-        });
-        currentRow.theadList.push({
-          title: '',
-          key: 'action'
-        });
-      }
-      return currentRow;
-    },
-    handleTime(time) {
-      let data = '-';
-      if (time) {
-        data = Date.parse(new Date()) - time;
-      }
-      return data;
-    },
-    handleExpandCollapseAll() {
-      // 处理展开收起所有(内嵌表格)
-      this.isExpandCollapse = !this.isExpandCollapse;
-      let expandCollapseIdList = [];
-      if (this.tableList && !this.$utils.isEmpty(this.tableList)) {
-        this.tableList.forEach(item => {
-          if (item && item.tbodyList && !this.$utils.isEmpty(item.tbodyList)) {
-            item.tbodyList.forEach((v) => {
-              v['_expand'] = this.isExpandCollapse;
-              if (this.isExpandCollapse) {
-                // 展开，需要存储展开的id
-                expandCollapseIdList.push(v.id);
-              } else {
-                expandCollapseIdList = [];
-              }
-            });
-          }
-        });
-      }
-      this.expandCollapseIdList = expandCollapseIdList;
-      this.$addHistoryData('isExpandCollapse', this.isExpandCollapse);
-      this.$addHistoryData('expandCollapseIdList', expandCollapseIdList);
-    },
-    openInnerTable(row, tIndex, rowIndex) {
-      // 展开收起内嵌表格
-      if (row['_expand']) {
-        row._expand = false;
-        this.$set(this.tableList[tIndex]['tbodyList'], rowIndex, row);
-        this.isExpandCollapse = false;
-        this.expandCollapseIdList && this.expandCollapseIdList.forEach((id, index) => {
-          if (id == row.id) {
-            this.expandCollapseIdList.splice(index, 1);
-          }
-        });
-      } else {
-        row._expand = true;
-        this.$set(this.tableList[tIndex]['tbodyList'], rowIndex, row);
-        this.isExpandCollapse = true;
-        if (!this.expandCollapseIdList.includes(row.id)) {
-          // id没有时，才push进去
-          this.expandCollapseIdList.push(row.id);
-        }
-      }
-      this.$addHistoryData('expandCollapseIdList', this.expandCollapseIdList);
-      this.$addHistoryData('isExpandCollapse', this.isExpandCollapse);
-    },
-    getInnerTbodyList(inspectResult) {
-      // 处理内嵌表格数据
-      let tbodyList = [];
-      if (inspectResult && !this.$utils.isEmpty(inspectResult)) {
-        tbodyList = inspectResult;
-      }
-      return tbodyList;
-    },
-    handleRefresh() {
-      // 处理刷新
-      this.tableConfig.currentPage = 1;
-      this.getTableData();
-    },
-    sendEmail() {
-      // 发送邮件
-      this.isShowSendEmail = true;
-    },
-    closeSendEmailDialog() {
-      this.isShowSendEmail = false;
-    },
-    toAssetsDetail(row) {
-      // 跳转巡检报告页面
-      window.open(HOME + '/inspect.html#/assets-detail-' + row.id, '_blank');
-    },
-    toJobDetail(row) {
-      // 工作详情
-      if (row && row.jobPhaseNodeVo) {
-        window.open(HOME + '/inspect.html#/job-detail?id=' + row.jobPhaseNodeVo.jobId + '&status=' + row.jobPhaseNodeVo.status, '_blank');
-       
-        // this.$router.push({path: '/job-detail?id=' + row.jobPhaseNodeVo.jobId + '&status=' + row.jobPhaseNodeVo.status});
-      }
-    },
-    toCientityView(row) {
-      // 跳转查看配置项页面
-      if (row && !this.$utils.isEmptyObj(row)) {
-        window.open(HOME + '/inspect.html#/ci/' + row.ciId + '/cientity-view/' + row.id, '_blank');
-      }
-      // this.$router.push({path: '/ci/' + row.typeId + '/cientity-view/' + row.id});
-    },
-    toCiView(ci) {
-      if (ci && !this.$utils.isEmptyObj(ci)) {
-        window.open(HOME + '/cmdb.html#/ci-view/' + ci.id, '_blank');
-      }
-    },
-    openRuleThresholdDialog(row) {
-      if (row && row.id) {
-        this.resourceId = row.id;
-        this.isShowRuleThresholdDialog = true;
-      }
-    },
-    closeRuleOfThresholdDialog() {
-      this.isShowRuleThresholdDialog = false;
-    }
-  },
-  filter: {},
-  computed: {
-    downloadUrl() {
-      return {
-        url: 'api/binary/inspect/new/problem/report/export',
-        method: 'post',
-        params: {
-          isNeedAlertDetail: 1,
-          appSystemId: this.appSystemId,
-          inspectStatusList: this.inspectStatusList
-        },
-        changeStatus: status => {
-          if (status == 'start') {
-            this.downloadLoading = true;
-          } else if (status == 'success' || status == 'error') {
-            this.downloadLoading = false;
-          }
-        }
-      };
-    }
-  },
-  watch: {
-    appModuleId(id) {
-      if (id) {
-        this.expandCollapseIdList = [];
-        this.isExpandCollapse = true;
-        this.isBack = false;
-        this.initData();
-      }
-    },
-    appSystemId(id) {
-      if (id && this.$utils.isEmpty(this.appModuleId)) {
-        this.expandCollapseIdList = [];
-        this.isExpandCollapse = true;
-        this.isBack = false;
-        this.initData();
-      }
-    }
-  }
-};
-</script>
-<style lang="less" scoped>
-.latest-question-manage-box {
-  .li-box {
-    margin-bottom: -10px;
-  .li-item {
-    padding: 6px 16px;
-    border-radius: 4px;
-    text-align: center;
-    margin-bottom: 10px;
-  }
- }
- .table-icon {
-  cursor: pointer;
-  font-size: 14px;
-  visibility: hidden;
-  padding: 1px 3px;
-  &.open {
-    visibility: visible;
-  }
-}
-tr:hover {
-  .table-icon {
-    visibility: visible;
-  }
- }
-}
-</style>
+<template>
+  <div class="latest-question-manage-box padding">
+    <Loading :loadingShow="loadingShow" type="fix"></Loading>
+    <div class="action-group text-right pb-sm">
+      <span :class="isExpandCollapse ? 'tsfont-up' : 'tsfont-down'" class="action-item" @click="handleExpandCollapseAll()">
+        <span v-if="isExpandCollapse">{{ $t('page.packup') }}</span>
+        <span v-else>{{ $t('page.expand') }}</span>
+      </span>
+      <span class="action-item tsfont-rotate-right" @click="handleRefresh()">{{ $t('page.refresh') }}</span>
+      <span v-if="!downloadLoading" v-download="downloadUrl" class="action-item tsfont-download">{{ $t('page.export') }}</span>
+      <span v-if="downloadLoading" class="action-item disable" :title="$t('page.downloadloadingtip')">
+        <Icon type="ios-loading" size="18" class="loading icon-right"></Icon>
+        {{ $t('page.export') }}
+      </span>
+      <span class="action-item tsfont-mail-unread-o" @click="sendEmail">{{ $t('page.mail') }}</span>
+    </div>
+    <div v-if="envList && envList.length > 0" class="li-box">
+      <Row :gutter="16">
+        <Col
+          v-for="item in envList"
+          :key="item.id"
+          :xs="12"
+          :sm="8"
+          :md="6"
+          :lg="4"
+          :xl="3"
+          :xxl="2"
+        >
+          <div
+            v-if="item.name"
+            class="li-item text-action"
+            :class="envId == item.id ? 'li-active li-text border-primary' : 'border-base bg-op'"
+            @click="selectedEnv(item.name)"
+          >{{ item.name }}</div>
+        </Col>
+      </Row>
+    </div>
+    <div v-if="tableList && tableList.length > 0 ">
+      <div v-for="(item, tIndex) in tableList" :key="tIndex">
+        <div class="h3 padding-sm">{{ item.viewLabel }}</div>
+        <div>
+          <TsTable
+            v-if="!loadingShow"
+            v-bind="filterTypeFields(item)"
+            :fixedHeader="false"
+            keyName="id"
+            canExpand
+            class="inner-table"
+            @changeCurrent="(currentPage) => changeCurrent(currentPage, item, tIndex)"
+            @changePageSize="(pageSize) => changePageSize(pageSize, item, tIndex)"
+          >
+            <template v-slot:ip="{ row }">
+              <span class="text-href" @click.stop="toAssetsDetail(row)">
+                <span>{{ row.ip.ip }}</span>
+                <span v-if="row.ip.port">:{{ row.ip.port }}</span>
+              </span>
+            </template>
+            <template v-slot:allIpList="{ row }">
+              <div v-if="!$utils.isEmpty(row.allIpList)">
+                <Tag
+                  v-for="(v, vindex) in row.allIpList"
+                  :key="vindex"
+                  class="cursor-pointer"
+                  @click.native="toCientityView(v)"
+                >
+                  {{ v.name }}
+                </Tag>
+              </div>
+              <div v-else></div>
+            </template>
+            <template v-slot:monitor="{ row }">
+              <!-- 监控状态 -->
+              <span v-if="row.monitor && row.monitor.time" :title="row.monitor.time | formatDate">
+                <span :class="[row.monitor.cssClass, {'background-FATAL': row.monitor.value== 'FATAL'}]" class="vertical">{{ row.monitor.text }} </span>
+                <span class="text-title">
+                  {{ handleTime(row.monitor.time) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
+                </span>
+              </span>
+              <span v-else>
+                <span>-</span>
+              </span>
+            </template>
+            <template v-slot:taskStatus="{ row }">
+              <CommonStatus
+                v-if="row.taskStatus"
+                :statusName="row.taskStatus.text"
+                :statusValue="row.taskStatus.value"
+                type="text"
+              ></CommonStatus>
+              <span v-else>-</span>
+            </template>
+            <template v-slot:inspect="{ row }">
+              <!-- 巡检状态 -->
+              <span v-if="row.inspect && row.inspect.time" :title="row.inspect.time | formatDate">
+                <span :class="[row.inspect.cssClass, {'background-FATAL': row.inspect.value== 'FATAL'}]" class="vertical cursor" @click="toAssetsDetail(row)">{{ row.inspect.text }} </span>
+                <span class="text-title">
+                  {{ handleTime(row.inspect.time) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
+                </span>
+              </span>
+              <span v-else>
+                <span>-</span>
+              </span>
+            </template>
+            <template v-slot:lcu="{row}">
+              <UserCard v-bind="row.lcu" :hideAvatar="true"></UserCard>
+            </template>
+            <template v-slot:lcd="{ row }">
+              <div v-if="row.lcd">{{ row.lcd | formatDate }}</div>
+            </template>
+            <template v-slot:fcu="{ row }">
+              <UserCard v-bind="row.fcu" :hideAvatar="true"></UserCard>
+            </template>
+            <template v-slot:fcd="{ row }">
+              <div v-if="row.fcd">{{ row.fcd | formatDate }}</div>
+            </template>
+            
+            <template v-slot:vendor="{ row }">
+              <!-- 厂商 -->
+              <Tag
+                v-if="!$utils.isEmpty(row.vendor)"
+                class="cursor-pointer"
+                @click.native="toCientityView(row.vendor)"
+              >
+                {{ row.vendor.name }}
+              </Tag>
+              <span v-else></span>
+            </template>
+            <template v-slot:appSystem="{row}">
+              <!-- 应用系统 -->
+              <div v-if="!$utils.isEmpty(row.appSystem)" class="text-href" @click="toCientityView(row.appSystem)">
+                <span :class="row.appSystem.ciIcon"></span>
+                <span>{{ row.appSystem.name }}</span>
+              </div>
+            </template>
+            <template v-slot:appModule="{ row }">
+              <!-- 应用模块 -->
+              <div v-if="!$utils.isEmpty(row.appModule)" class="text-href" @click="toCientityView(row.appModule)">
+                <span :class="row.appModule.ciIcon"></span>
+                <span>{{ row.appModule.name }}</span>
+              </div>
+            </template>
+            <template v-slot:appEnvironment="{ row }">
+              <!-- 环境 -->
+              <Tag
+                v-if="!$utils.isEmpty(row.appEnvironment)"
+                class="cursor-pointer"
+                @click.native="toGlobalAttrManage()"
+              >
+                {{ row.appEnvironment.value }}
+              </Tag>
+            </template>
+            <template v-slot:state="{row}">
+              <!-- 资产状态 -->
+              <Tag
+                v-if="!$utils.isEmpty(row.state)"
+                class="cursor-pointer"
+                @click.native="toCientityView(row.state)"
+              >
+                {{ row.state.name }}
+              </Tag>
+            </template>
+            <template v-slot:ownerList="{ row }">
+              <div v-if="!$utils.isEmpty(row.ownerList)">
+                <Tag
+                  v-for="(o, oindex) in row.ownerList"
+                  :key="oindex"
+                  class="cursor-pointer"
+                  @click.native="toCientityView(o);"
+                >
+                  {{ o.name }}
+                </Tag>
+              </div>
+              <div v-else></div>
+            </template>
+            <template v-slot:businessGroupList="{ row }">
+              <div v-if="!$utils.isEmpty(row.businessGroupList)">
+                <Tag
+                  v-for="(b, bindex) in row.businessGroupList"
+                  :key="bindex"
+                  class="cursor-pointer"
+                  @click.native="toCientityView(b)"
+                >
+                  {{ b.name }}
+                </Tag>
+              </div>
+              <div v-else></div>
+            </template>
+            <template v-slot:ci="{row}">
+              <!-- 模型 -->
+              <div v-if="!$utils.isEmpty(row.ci)" class="text-href" @click="toCiView(row.ci)">
+                <span :class="row.ci.icon"></span>
+                <span>{{ row.ci.label }}</span>
+              </div>
+            </template>
+            <template v-slot:dataCenter="{ row }">
+              <!-- 数据中心 -->
+              <Tag
+                v-if="!$utils.isEmpty(row.dataCenter)"
+                class="cursor-pointer"
+                @click.native="toCientityView(row.dataCenter)"
+              >
+                {{ row.dataCenter.name }}
+              </Tag>
+              <span v-else></span>
+            </template>
+            <template v-slot:expandCollapseArrow="{ row ,index}">
+              <span :class="{ 'tsfont-right': !row._expand, 'tsfont-down open': row._expand }" class="table-icon" @click.stop="openInnerTable(row, tIndex, index)"></span>
+            </template>
+            <template v-slot:expand="{ row }">
+              <ExpandTable v-if="row._expand" style="margin-left: 40px;" :inspectResultList="getInnerTbodyList(row.inspectResult)"></ExpandTable>
+            </template>
+            <template v-slot:action="{ row }">
+              <div class="tstable-action">
+                <ul class="tstable-action-ul">
+                  <li class="tsfont-setting" @click="openRuleThresholdDialog(row)">{{ $t('term.inspect.thresholdrule') }}</li>
+                  <li v-if="row && row.jobPhaseNodeVo && row.jobPhaseNodeVo.jobId" class="tsfont-history" @click="toJobDetail(row)">{{ $t('term.inspect.jobdetail') }}</li>
+                  <li v-if="row.ip" class="tsfont-ci" @click="toCientityView(row.ip)">{{ $t('term.cmdb.viewcientity') }}</li>
+                </ul>
+              </div>
+            </template>
+          </TsTable>
+        </div>
+      </div>
+    </div>
+    <NoData v-else></NoData>
+    <SendEmail
+      v-if="isShowSendEmail"
+      :params="{
+        isNeedAlertDetail: 1,
+        appSystemId: appSystemId,
+        inspectStatusList: inspectStatusList
+      }"
+      @closeSendEmailDialog="closeSendEmailDialog"
+    ></SendEmail>
+    <RuleOfThresholdDialog
+      v-if="isShowRuleThresholdDialog"
+      :appSystemId="appSystemId"
+      :resourceId="resourceId"
+      @close="closeRuleOfThresholdDialog"
+    ></RuleOfThresholdDialog>
+  </div>
+</template>
+<script>
+import download from '@/resources/directives/download.js';
+export default {
+  name: '',
+  components: {
+    UserCard: () => import('@/resources/components/UserCard/UserCard.vue'),
+    TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
+    CommonStatus: () => import('@/resources/components/Status/CommonStatus.vue'),
+    ExpandTable: () => import('@/views/pages/inspect/recentIssues/component/expand-table.vue'),
+    SendEmail: () => import('@/views/pages/inspect/recentIssues/component/send-email.vue'),
+    RuleOfThresholdDialog: () => import('./threshold/rule-of-threshold-dialog.vue')
+  },
+  directives: { download },
+  props: {
+    appSystemId: {
+      // 应用Id
+      type: Number,
+      default: null
+    },
+    appModuleId: {
+      // 模块Id
+      type: Number,
+      default: null
+    }
+  },
+  data() {
+    return {
+      loadingShow: true,
+      isExpandCollapse: true, // 处理展开收起，默认展开
+      isShowSendEmail: false,
+      downloadLoading: false,
+      isShowRuleThresholdDialog: false,
+      typeName: '',
+      envId: null, // 环境ID
+      envList: [], // 环境列表
+      expandCollapseIdList: [], // 展开收起Id列表，下榻页面，返回显示用
+      isBack: false,
+      tableList: [],
+      tableConfig: {
+        tbodyList: [],
+        pageSize: 20,
+        currentPage: 1,
+        rowNum: null
+      }
+      // theadList: [
+      //   {
+      //     title: '',
+      //     key: 'expandCollapseArrow' // 展开收起箭头
+      //   },
+      //   {
+      //     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: this.$t('term.inspect.inspectionjobstatus'),
+      //     key: 'taskStatus'
+      //   },
+      //   {
+      //     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: '',
+      //     key: 'action'
+      //   }
+      // ]
+    };
+  },
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {
+    this.initData();
+  },
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    async initData() {
+      this.tableConfig.currentPage = 1;
+      await this.getEnvList();
+      await this.getInspectStatusList();
+      await this.getTableData();
+    },
+    async getEnvList() {
+      await this.$api.cmdb.applicationManage.getEnvironmenteList().then(res => {
+        if (res.Status == 'OK') {
+          this.envList = res.Return?.tbodyList || [];
+          this.envList.unshift({
+            name: this.$t('term.inspect.allenv'),
+            id: ''
+          });
+          this.envList.push({
+            name: this.$t('term.inspect.noconfigenv'),
+            id: -2
+          });
+          this.envId = this.envId || ''; // 有环境id，就取环境ID的值，否则默认选择所有环境（用于下榻页面返回）
+        }
+      });
+    },
+    async getInspectStatusList() {
+      // 获取巡检状态列表
+      this.inspectStatusList = [];
+      await this.$api.common.getSelectList({enumClass: 'InspectStatus'}).then((res) => {
+        if (res.Status == 'OK') {
+          let nodeList = res.Return || [];
+          if (nodeList && nodeList.length > 0) {
+            nodeList.forEach(item => {
+              if (item && item.value != 'normal') {
+                this.inspectStatusList.push(item.value);
+              }
+            });
+          }
+        }
+      });
+    },
+    getTableData(row, index) {
+      //获取表格数据
+      let params = {
+        appSystemId: this.appSystemId,
+        appModuleId: this.appModuleId,
+        envId: this.envId,
+        inspectStatusList: this.inspectStatusList,
+        currentPage: this.tableConfig.currentPage,
+        pageSize: this.tableConfig.pageSize
+      };
+      this.$addHistoryData('isExpandCollapse', this.isExpandCollapse);
+      this.$addHistoryData('expandCollapseIdList', this.expandCollapseIdList);
+      this.$addHistoryData('envId', this.envId);
+      this.loadingShow = true;
+      this.$api.inspect.applicationInspect.getNewapplicationInspectList(params).then(res => {
+        if (res.Status == 'OK') {
+          if (row && !this.$utils.isEmptyObj(row)) {
+            // 内嵌列表翻页
+            let tableList = (res.Return && res.Return.tableList) ? ((res.Return.tableList.length > index) ? res.Return.tableList[index] : res.Return.tableList[0]) : [];
+            let currentRow = Object.assign({}, row, tableList);
+            this.tableConfig.pageSize = tableList ? tableList.pageSize : 20;
+            this.tableConfig.currentPage = tableList ? tableList.currentPage : 1;
+            this.$set(this.tableList, index, currentRow);
+          } else {
+            this.tableList = res.Return ? res.Return.tableList : [];
+            this.tableConfig.pageSize = 20;
+            this.tableConfig.currentPage = 1;
+          }
+          let resourceIdList = [];
+          if (this.tableList && !this.$utils.isEmpty(this.tableList)) {
+            this.tableList.forEach(item => {
+              if (item && item.tbodyList && !this.$utils.isEmpty(item.tbodyList)) {
+                item.tbodyList.forEach((v) => {
+                  if (v && v.id) {
+                    resourceIdList.push(v.id);
+                  }
+                });
+              }
+            });
+          }
+          if (this.$utils.isEmpty(this.expandCollapseIdList) && this.isExpandCollapse) {
+            // 首次需要把id存起来，下榻页面返回需要使用
+            this.expandCollapseIdList = resourceIdList;
+            this.$addHistoryData('expandCollapseIdList', this.expandCollapseIdList);
+          }
+          this.getInnerTableList(resourceIdList); // 获取内嵌表格数据
+        }
+      }).catch(() => {
+        this.loadingShow = false;
+      });
+    },
+    getInnerTableList(resourceIdList) {
+      // 获取内嵌表格数据
+      this.loadingShow = true;
+      if (resourceIdList && !this.$utils.isEmpty(resourceIdList)) {
+        this.$api.inspect.inspectJob.getRecentIssuesInnerTableList({ resourceIdList: resourceIdList }).then(res => {
+          if (res.Status == 'OK') {
+            let obj = res.Return;
+            this.tableList.forEach(item => {
+              if (item && item.tbodyList && !this.$utils.isEmpty(item.tbodyList)) {
+                item.tbodyList.forEach((v) => {
+                  Object.keys(obj).forEach(n => {
+                    if (v.id == n) {
+                      this.$set(v, 'inspectResult', obj[n] ? Object.values(obj[n]) : []);
+                    }
+                  });
+                });
+              }
+            });
+            if (this.tableList && !this.$utils.isEmpty(this.tableList)) {
+              this.tableList.forEach(val => {
+                if (val && val.tbodyList && !this.$utils.isEmpty(val.tbodyList)) {
+                  val.tbodyList.forEach((v) => {
+                    if (v && v.hasOwnProperty('inspectResult') && !this.$utils.isEmpty(v.inspectResult)) {
+                      if (this.isBack) { // 下榻页面返回，恢复之前展开收起状态
+                        v['_expand'] = !this.$utils.isEmpty(this.expandCollapseIdList) ? this.expandCollapseIdList.includes(v.id) : this.isExpandCollapse;
+                      } else {
+                        v['_expand'] = this.isExpandCollapse;
+                      }
+                    }
+                  });
+                }
+              });
+            }
+          }
+        }).finally(() => {
+          this.loadingShow = false;
+        });
+      } else {
+        this.loadingShow = false;
+      }
+    },
+    changeCurrent(currentPage, item, index) {
+      this.tableConfig.currentPage = currentPage;
+      this.getTableData(item, index);
+    },
+    changePageSize(pageSize, item, index) {
+      this.tableConfig.pageSize = pageSize;
+      this.tableConfig.currentPage = 1;
+      this.getTableData(item, index);
+    },
+    restoreHistory(historyData) {
+      // 下榻页面，返回搜索条件保持一致
+      this.isBack = true;
+      this.envId = historyData['envId'];
+      this.expandCollapseIdList = historyData['expandCollapseIdList'];
+      this.isExpandCollapse = historyData['isExpandCollapse'];
+    },
+    selectedEnv(name) {
+      let envId = null;
+      this.envList.forEach(v => {
+        if (v.name == name) {
+          envId = v.id;
+        }
+      });
+      this.envId = envId;
+      this.tableConfig.currentPage = 1;
+      this.getTableData();
+    },
+    filterTypeFields(row) {
+      // 过滤类型字段，修复控制台报错问题
+      let currentRow = this.$utils.deepClone(row);
+      if (currentRow && currentRow.hasOwnProperty('type')) {
+        delete currentRow.type;
+      }
+      if (currentRow && currentRow.hasOwnProperty('theadList')) {
+        currentRow.theadList.unshift({
+          title: '',
+          key: 'expandCollapseArrow' // 展开收起箭头
+        });
+        currentRow.theadList.push({
+          title: '',
+          key: 'action'
+        });
+      }
+      return currentRow;
+    },
+    handleTime(time) {
+      let data = '-';
+      if (time) {
+        data = Date.parse(new Date()) - time;
+      }
+      return data;
+    },
+    handleExpandCollapseAll() {
+      // 处理展开收起所有(内嵌表格)
+      this.isExpandCollapse = !this.isExpandCollapse;
+      let expandCollapseIdList = [];
+      if (this.tableList && !this.$utils.isEmpty(this.tableList)) {
+        this.tableList.forEach(item => {
+          if (item && item.tbodyList && !this.$utils.isEmpty(item.tbodyList)) {
+            item.tbodyList.forEach((v) => {
+              v['_expand'] = this.isExpandCollapse;
+              if (this.isExpandCollapse) {
+                // 展开，需要存储展开的id
+                expandCollapseIdList.push(v.id);
+              } else {
+                expandCollapseIdList = [];
+              }
+            });
+          }
+        });
+      }
+      this.expandCollapseIdList = expandCollapseIdList;
+      this.$addHistoryData('isExpandCollapse', this.isExpandCollapse);
+      this.$addHistoryData('expandCollapseIdList', expandCollapseIdList);
+    },
+    openInnerTable(row, tIndex, rowIndex) {
+      // 展开收起内嵌表格
+      if (row['_expand']) {
+        row._expand = false;
+        this.$set(this.tableList[tIndex]['tbodyList'], rowIndex, row);
+        this.isExpandCollapse = false;
+        this.expandCollapseIdList && this.expandCollapseIdList.forEach((id, index) => {
+          if (id == row.id) {
+            this.expandCollapseIdList.splice(index, 1);
+          }
+        });
+      } else {
+        row._expand = true;
+        this.$set(this.tableList[tIndex]['tbodyList'], rowIndex, row);
+        this.isExpandCollapse = true;
+        if (!this.expandCollapseIdList.includes(row.id)) {
+          // id没有时，才push进去
+          this.expandCollapseIdList.push(row.id);
+        }
+      }
+      this.$addHistoryData('expandCollapseIdList', this.expandCollapseIdList);
+      this.$addHistoryData('isExpandCollapse', this.isExpandCollapse);
+    },
+    getInnerTbodyList(inspectResult) {
+      // 处理内嵌表格数据
+      let tbodyList = [];
+      if (inspectResult && !this.$utils.isEmpty(inspectResult)) {
+        tbodyList = inspectResult;
+      }
+      return tbodyList;
+    },
+    handleRefresh() {
+      // 处理刷新
+      this.tableConfig.currentPage = 1;
+      this.getTableData();
+    },
+    sendEmail() {
+      // 发送邮件
+      this.isShowSendEmail = true;
+    },
+    closeSendEmailDialog() {
+      this.isShowSendEmail = false;
+    },
+    toAssetsDetail(row) {
+      // 跳转巡检报告页面
+      window.open(HOME + '/inspect.html#/assets-detail-' + row.id, '_blank');
+    },
+    toJobDetail(row) {
+      // 工作详情
+      if (row && row.jobPhaseNodeVo) {
+        window.open(HOME + '/inspect.html#/job-detail?id=' + row.jobPhaseNodeVo.jobId + '&status=' + row.jobPhaseNodeVo.status, '_blank');
+       
+        // this.$router.push({path: '/job-detail?id=' + row.jobPhaseNodeVo.jobId + '&status=' + row.jobPhaseNodeVo.status});
+      }
+    },
+    toCientityView(row) {
+      // 跳转查看配置项页面
+      if (row && !this.$utils.isEmptyObj(row)) {
+        window.open(HOME + '/inspect.html#/ci/' + row.ciId + '/cientity-view/' + row.id, '_blank');
+      }
+      // this.$router.push({path: '/ci/' + row.typeId + '/cientity-view/' + row.id});
+    },
+    toCiView(ci) {
+      if (ci && !this.$utils.isEmptyObj(ci)) {
+        window.open(HOME + '/cmdb.html#/ci-view/' + ci.id, '_blank');
+      }
+    },
+    openRuleThresholdDialog(row) {
+      if (row && row.id) {
+        this.resourceId = row.id;
+        this.isShowRuleThresholdDialog = true;
+      }
+    },
+    closeRuleOfThresholdDialog() {
+      this.isShowRuleThresholdDialog = false;
+    }
+  },
+  filter: {},
+  computed: {
+    downloadUrl() {
+      return {
+        url: 'api/binary/inspect/new/problem/report/export',
+        method: 'post',
+        params: {
+          isNeedAlertDetail: 1,
+          appSystemId: this.appSystemId,
+          inspectStatusList: this.inspectStatusList
+        },
+        changeStatus: status => {
+          if (status == 'start') {
+            this.downloadLoading = true;
+          } else if (status == 'success' || status == 'error') {
+            this.downloadLoading = false;
+          }
+        }
+      };
+    }
+  },
+  watch: {
+    appModuleId(id) {
+      if (id) {
+        this.expandCollapseIdList = [];
+        this.isExpandCollapse = true;
+        this.isBack = false;
+        this.initData();
+      }
+    },
+    appSystemId(id) {
+      if (id && this.$utils.isEmpty(this.appModuleId)) {
+        this.expandCollapseIdList = [];
+        this.isExpandCollapse = true;
+        this.isBack = false;
+        this.initData();
+      }
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+.latest-question-manage-box {
+  .li-box {
+    margin-bottom: -10px;
+  .li-item {
+    padding: 6px 16px;
+    border-radius: 4px;
+    text-align: center;
+    margin-bottom: 10px;
+  }
+ }
+ .table-icon {
+  cursor: pointer;
+  font-size: 14px;
+  visibility: hidden;
+  padding: 1px 3px;
+  &.open {
+    visibility: visible;
+  }
+}
+tr:hover {
+  .table-icon {
+    visibility: visible;
+  }
+ }
+}
+</style>
-- 
Gitee


From 32c9e0d770a828a8c9813019480cb9d437181d15 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Wed, 2 Apr 2025 10:38:38 +0800
Subject: [PATCH 18/20] =?UTF-8?q?[=E5=85=B3=E8=81=94]=20#[1349157963399168?=
 =?UTF-8?q?]CMDB=E5=BA=94=E7=94=A8=E6=B8=85=E5=8D=95=E6=94=B9=E6=88=90?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=B1=82=E7=BA=A7=E5=8F=AF=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=20http://192.168.0.96:8090/demo/rdm.html#/story-detail/9390509?=
 =?UTF-8?q?47543040/939050947543042/1349157963399168?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cmdb/application/application-manage.vue   |   21 +-
 .../pages/cmdb/application/assets-manage.vue  |  209 ++-
 .../ci-attr-setting-dialog.vue.vue            |    0
 .../cmdb/newapplication/app-edit-dialog.vue   |   82 --
 .../cmdb/newapplication/app-module-tree.vue   |  553 -------
 .../newapplication/application-manage.vue     |  253 ----
 .../newapplication/appmodule-edit-dialog.vue  |   87 --
 .../cmdb/newapplication/assets-manage.vue     |  394 -----
 .../pages/cmdb/newapplication/automation.vue  |  152 --
 .../newapplication/inspect-status-detail.vue  |   34 -
 src/views/pages/cmdb/router.js                |   13 -
 .../application/application-manage.vue        |    2 +-
 .../application/inspection-assets-manage.vue  |  794 +++++-----
 .../application/latest-questions-manage.vue   | 1296 +++++++++--------
 .../threshold/rule-of-threshold-dialog.vue    |    2 +-
 .../applicationNew/application-detail.vue     |    0
 .../applicationNew/application-manage.vue     |  332 -----
 .../batch-module-inspection-dialog.vue        |  398 -----
 .../batch-system-inspection-dialog.vue        |  409 ------
 .../applicationNew/edit-cron-dialog.vue       |  135 --
 .../inspection-assets-manage.vue              |  457 ------
 .../inspection-schedule-dialog.vue            |  278 ----
 .../applicationNew/job-list-dialog.vue        |   95 --
 .../latest-questions-manage.vue               |  719 ---------
 .../threshold/app-threshold-rule-add.vue      |  485 ------
 .../threshold/copy-rule-dialog.vue            |  145 --
 .../threshold/rule-of-threshold-detail.vue    |  173 ---
 .../threshold/rule-of-threshold-dialog.vue    |  127 --
 .../threshold/rule-of-threshold-manage.vue    |  157 --
 src/views/pages/inspect/router.js             |   13 -
 30 files changed, 1358 insertions(+), 6457 deletions(-)
 rename src/views/pages/cmdb/{newapplication => application}/ci-attr-setting-dialog.vue.vue (100%)
 delete mode 100644 src/views/pages/cmdb/newapplication/app-edit-dialog.vue
 delete mode 100644 src/views/pages/cmdb/newapplication/app-module-tree.vue
 delete mode 100644 src/views/pages/cmdb/newapplication/application-manage.vue
 delete mode 100644 src/views/pages/cmdb/newapplication/appmodule-edit-dialog.vue
 delete mode 100644 src/views/pages/cmdb/newapplication/assets-manage.vue
 delete mode 100644 src/views/pages/cmdb/newapplication/automation.vue
 delete mode 100644 src/views/pages/cmdb/newapplication/inspect-status-detail.vue
 delete mode 100644 src/views/pages/inspect/applicationNew/application-detail.vue
 delete mode 100644 src/views/pages/inspect/applicationNew/application-manage.vue
 delete mode 100644 src/views/pages/inspect/applicationNew/batch-module-inspection-dialog.vue
 delete mode 100644 src/views/pages/inspect/applicationNew/batch-system-inspection-dialog.vue
 delete mode 100644 src/views/pages/inspect/applicationNew/edit-cron-dialog.vue
 delete mode 100644 src/views/pages/inspect/applicationNew/inspection-assets-manage.vue
 delete mode 100644 src/views/pages/inspect/applicationNew/inspection-schedule-dialog.vue
 delete mode 100644 src/views/pages/inspect/applicationNew/job-list-dialog.vue
 delete mode 100644 src/views/pages/inspect/applicationNew/latest-questions-manage.vue
 delete mode 100644 src/views/pages/inspect/applicationNew/threshold/app-threshold-rule-add.vue
 delete mode 100644 src/views/pages/inspect/applicationNew/threshold/copy-rule-dialog.vue
 delete mode 100644 src/views/pages/inspect/applicationNew/threshold/rule-of-threshold-detail.vue
 delete mode 100644 src/views/pages/inspect/applicationNew/threshold/rule-of-threshold-dialog.vue
 delete mode 100644 src/views/pages/inspect/applicationNew/threshold/rule-of-threshold-manage.vue

diff --git a/src/views/pages/cmdb/application/application-manage.vue b/src/views/pages/cmdb/application/application-manage.vue
index 4558fa452..9fb6c6353 100644
--- a/src/views/pages/cmdb/application/application-manage.vue
+++ b/src/views/pages/cmdb/application/application-manage.vue
@@ -5,6 +5,7 @@
         <div class="action-group">
           <span v-if="$AuthUtils.hasRole('RESOURCECENTER_MODIFY')" class="action-item tsfont-plus" @click="addApp()">{{ $t('page.apply') }}</span>
           <span v-if="$AuthUtils.hasRole('RESOURCECENTER_MODIFY')" class="action-item tsfont-plus" @click="addAppModule()">{{ $t('page.module') }}</span>
+          <span class="action-item tsfont-plus" @click="addSettingDialog()">{{ $t('page.setting') }}</span>
         </div>
       </template>
       <template v-slot:topRight>
@@ -31,6 +32,7 @@
           <TabPane :label="$t('term.inspect.assetlist')" name="assetsList">
             <AssetsManage
               v-if="tabValue == 'assetsList'"
+              ref="assetsManage"
               class="assets-manage-box"
               :appSystemId="appSystemId"
               :appModuleId="appModuleId"
@@ -70,6 +72,7 @@
       :ciEntityId="deleteCiEntityId"
       @close="closeDeleteDialog"
     ></DeleteCiEntityDialog>
+    <CiAttrSettingDialog v-if="isSettingDialogShow" @close="closeSettingDialog"></CiAttrSettingDialog>
   </div>
 </template>
 <script>
@@ -82,7 +85,8 @@ export default {
     AppModuleEditDialog: () => import('./appmodule-edit-dialog.vue'),
     DeleteCiEntityDialog: () => import('../cientity/cientity-delete-dialog.vue'),
     AssetsManage: () => import('./assets-manage'), // 资产清单
-    AppModuleTree: () => import('./app-module-tree') // 应用模块树
+    AppModuleTree: () => import('./app-module-tree'), // 应用模块树
+    CiAttrSettingDialog: () => import('./ci-attr-setting-dialog.vue')
   },
   props: {},
   data() {
@@ -101,7 +105,9 @@ export default {
       selectedApp: null,
       selectedModule: null,
       appModueData: {},
-      ciEntityData: {} // 添加模块时，用于锁定应用
+      ciEntityData: {}, // 添加模块时，用于锁定应用
+      isSettingDialogShow: false 
+
     };
   },
   beforeCreate() {},
@@ -221,6 +227,17 @@ export default {
             this.ciEntityData = { uuid: this.$utils.setUuid(), relEntityData: relEntityData };
           });
       }
+    },
+    addSettingDialog() {
+      this.isSettingDialogShow = true;
+    },
+    closeSettingDialog(needRefresh) {
+      this.isSettingDialogShow = false;
+      if (needRefresh) {
+        if (this.tabValue === 'assetsList') {
+          this.$refs.assetsManage.initData();
+        }
+      }
     }
   },
   filter: {},
diff --git a/src/views/pages/cmdb/application/assets-manage.vue b/src/views/pages/cmdb/application/assets-manage.vue
index 8cfd082c1..6631aebdf 100644
--- a/src/views/pages/cmdb/application/assets-manage.vue
+++ b/src/views/pages/cmdb/application/assets-manage.vue
@@ -24,52 +24,156 @@
     </div>
     <div v-if="tableList && tableList.length > 0 ">
       <div v-for="(item, index) in tableList" :key="index">
-        <div class="h3 padding-sm">{{ item.type.label }}</div>
+        <div class="h3 padding-sm">{{ item.viewLabel }}</div>
         <TsTable
           :fixedHeader="false"
-          :theadList="theadList"
+          :theadList="item.theadList"
           v-bind="filterTypeFields(item)"
           @changeCurrent="(currentPage) => changeCurrent(currentPage, item, index)"
           @changePageSize="(pageSize) => changePageSize(pageSize,item, index)"
         >
           <template v-slot:ip="{ row }">
-            <span class="text-href" @click="toCientityView(row)">
-              <span>{{ row.ip }}</span>
-              <span v-if="row.port">:{{ row.port }}</span>
+            <span v-if="!$utils.isEmpty(row.ip)" class="text-href" @click="toCientityView(row.ip)">
+              <span>{{ row.ip.ip }}</span>
+              <span v-if="row.ip.port">:{{ row.ip.port }}</span>
             </span>
+            <span v-else></span>
           </template>
-          <template v-slot:monitorStatus="{ row }">
+          <template v-slot:allIpList="{ row }">
+            <div v-if="!$utils.isEmpty(row.allIpList)">
+              <Tag
+                v-for="(v, vindex) in row.allIpList"
+                :key="vindex"
+                class="cursor-pointer"
+                @click.native="toCientityView(v)"
+              >
+                {{ v.name }}
+              </Tag>
+            </div>
+            <div v-else></div>
+          </template>
+          <template v-slot:lcu="{row}">
+            <UserCard v-bind="row.lcu" :hideAvatar="true"></UserCard>
+          </template>
+          <template v-slot:fcu="{ row }">
+            <UserCard v-bind="row.fcu" :hideAvatar="true"></UserCard>
+          </template>
+          <template v-slot:vendor="{ row }">
+            <Tag
+              v-if="!$utils.isEmpty(row.vendor)"
+              class="cursor-pointer"
+              @click.native="toCientityView(row.vendor)"
+            >
+              {{ row.vendor.name }}
+            </Tag>
+            <span v-else></span>
+          </template>
+          <template v-slot:monitor="{ row }">
             <!-- 监控状态 -->
-            <span v-if="row.monitorStatusJson && row.monitorTime" :title="row.monitorTime | formatDate">
-              <span :class="[row.monitorStatusJson.cssClass, {'background-FATAL': row.monitorStatusJson.value== 'FATAL'}]" class="vertical cursor">{{ row.monitorStatusJson.text }} </span>
+            <span v-if="row.monitor && row.monitor.time" :title="row.monitor.time | formatDate">
+              <span :class="[row.monitor.cssClass, {'background-FATAL': row.monitor.value== 'FATAL'}]" class="vertical">{{ row.monitor.text }} </span>
               <span class="text-title">
-                {{ handleTimes(row.monitorTime) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
+                {{ handleTimes(row.monitor.time) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
               </span>
             </span>
-            <span v-else>
-              <span>-</span>
-            </span>
+            <span v-else></span>
           </template>
-          <template v-slot:inspectStatus="{ row }">
+          <template v-slot:inspect="{ row }">
             <!-- 巡检状态 -->
-            <span v-if="row.inspectStatusJson && row.inspectTime" :title="row.inspectTime | formatDate">
-              <span :class="[row.inspectStatusJson.cssClass, {'background-FATAL': row.inspectStatusJson.value== 'FATAL'}]" class="vertical cursor" @click="toInspectStatusDetail(row)">{{ row.inspectStatusJson.text }} </span>
+            <span v-if="row.inspect && row.inspect.time" :title="row.inspect.time | formatDate">
+              <span :class="[row.inspect.cssClass, {'background-FATAL': row.inspect.value== 'FATAL'}]" class="vertical cursor" @click="toInspectStatusDetail(row)">{{ row.inspect.text }} </span>
               <span class="text-title">
-                {{ handleTimes(row.inspectTime) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
+                {{ handleTimes(row.inspect.time) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
               </span>
             </span>
             <span v-else>-</span>
           </template>
-          <template v-slot:bgList="{ row }">
-            <GroupList :dataList="row.bgList" type="tag" textName="bgName"></GroupList>
+          <template v-slot:appModule="{ row }">
+            <div v-if="!$utils.isEmpty(row.appModule)" class="text-href" @click="toCientityView(row.appModule)">
+              <span :class="row.appModule.ciIcon"></span>
+              <span>{{ row.appModule.name }}</span>
+            </div>
+          </template>
+          <template v-slot:appEnvironment="{ row }">
+            <Tag
+              v-if="!$utils.isEmpty(row.appEnvironment)"
+              class="cursor-pointer"
+              @click.native="toGlobalAttrManage()"
+            >
+              {{ row.appEnvironment.value }}
+            </Tag>
+          </template>
+          <template v-slot:appSystem="{row}">
+            <!-- 应用系统 -->
+            <div v-if="!$utils.isEmpty(row.appSystem)" class="text-href" @click="toCientityView(row.appSystem)">
+              <span :class="row.appSystem.ciIcon"></span>
+              <span>{{ row.appSystem.name }}</span>
+            </div>
+          </template>
+          <template v-slot:businessGroupList="{ row }">
+            <div v-if="!$utils.isEmpty(row.businessGroupList)">
+              <Tag
+                v-for="(b, bindex) in row.businessGroupList"
+                :key="bindex"
+                class="cursor-pointer"
+                @click.native="toCientityView(b)"
+              >
+                {{ b.name }}
+              </Tag>
+            </div>
+            <div v-else></div>
+          </template>
+          <template v-slot:state="{row}">
+            <!-- 资产状态 -->
+            <Tag
+              v-if="!$utils.isEmpty(row.state)"
+              class="cursor-pointer"
+              @click.native="toCientityView(row.state)"
+            >
+              {{ row.state.name }}
+            </Tag>
           </template>
           <template v-slot:ownerList="{ row }">
-            <GroupList :dataList="row.ownerList" type="tag" textName="userName"></GroupList>
+            <div v-if="!$utils.isEmpty(row.ownerList)">
+              <Tag
+                v-for="(o, oindex) in row.ownerList"
+                :key="oindex"
+                class="cursor-pointer"
+                @click.native="toCientityView(o);"
+              >
+                {{ o.name }}
+              </Tag>
+            </div>
+            <div v-else></div>
           </template>
-          <template v-slot:clusterName="{row}">
-            <!-- 所在集群 -->
-            <span v-if="row" class="text-href" @click="gotoCluster(row)">{{ row.clusterName }}</span>
+          <template v-slot:ci="{row}">
+            <!-- 模型 -->
+            <div v-if="!$utils.isEmpty(row.ci)" class="text-href" @click="toCiView(row.ci)">
+              <span :class="row.ci.icon"></span>
+              <span>{{ row.ci.label }}</span>
+            </div>
+          </template>
+          <template v-slot:dataCenter="{ row }">
+            <!-- 数据中心 -->
+            <Tag
+              v-if="!$utils.isEmpty(row.dataCenter)"
+              class="cursor-pointer"
+              @click.native="toCientityView(row.dataCenter)"
+            >
+              {{ row.dataCenter.name }}
+            </Tag>
+            <span v-else></span>
+          </template>
+          <template v-slot:fcd="{ row }">
+            <div v-if="row.fcd">{{ row.fcd | formatDate }}</div>
           </template>
+          <template v-slot:lcd="{ row }">
+            <div v-if="row.lcd">{{ row.lcd | formatDate }}</div>
+          </template>
+          <!-- <template v-slot:clusterName="{row}">
+            所在集群 
+            <span v-if="row" class="text-href" @click="gotoCluster(row)">{{ row.clusterName }}</span>
+          </template> -->
         </TsTable>
       </div>
     </div>
@@ -80,8 +184,8 @@
 export default {
   name: '',
   components: {
-    GroupList: () => import('@/resources/components/GroupList/GroupList.vue'),
-    TsTable: () => import('@/resources/components/TsTable/TsTable.vue')
+    TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
+    UserCard: () => import('@/resources/components/UserCard/UserCard.vue')
   },
   filters: {},
   props: {
@@ -109,21 +213,21 @@ export default {
         rowNum: 0,
         pageSize: 20,
         currentPage: 1
-      },
-      theadList: [
-        { key: 'ip', title: this.$t('page.ipaddress')},
-        { key: 'name', title: this.$t('page.name')},
-        { key: 'monitorStatus', title: this.$t('term.inspect.monitoringstate')},
-        { key: 'inspectStatus', title: this.$t('term.autoexec.inspectstatus')},
-        { key: 'stateName', title: this.$t('term.autoexec.assetstatus')},
-        { key: 'envName', title: this.$t('term.inspect.envname')},
-        { key: 'clusterName', title: this.$t('term.inspect.clustername')},
-        { key: 'dataCenterName', title: this.$t('term.inspect.datacenter')},
-        { key: 'networkArea', title: this.$t('page.networkarea')},
-        { key: 'ownerList', title: this.$t('page.owner')},
-        { key: 'bgList', title: this.$t('term.autoexec.subordinatedepartment')},
-        { key: 'maintenanceWindow', title: this.$t('term.deploy.maintenancewindow')}
-      ]
+      }
+      // theadList: [
+      //   { key: 'ip', title: this.$t('page.ipaddress')},
+      //   { key: 'name', title: this.$t('page.name')},
+      //   { key: 'monitorStatus', title: this.$t('term.inspect.monitoringstate')},
+      //   { key: 'inspectStatus', title: this.$t('term.autoexec.inspectstatus')},
+      //   { key: 'stateName', title: this.$t('term.autoexec.assetstatus')},
+      //   { key: 'envName', title: this.$t('term.inspect.envname')},
+      //   { key: 'clusterName', title: this.$t('term.inspect.clustername')},
+      //   { key: 'dataCenterName', title: this.$t('term.inspect.datacenter')},
+      //   { key: 'networkArea', title: this.$t('page.networkarea')},
+      //   { key: 'ownerList', title: this.$t('page.owner')},
+      //   { key: 'bgList', title: this.$t('term.autoexec.subordinatedepartment')},
+      //   { key: 'maintenanceWindow', title: this.$t('term.deploy.maintenancewindow')}
+      // ]
     };
   },
   beforeCreate() {},
@@ -156,9 +260,11 @@ export default {
     },
     changePageSize(pageSize, item, index) {
       this.tableData.pageSize = pageSize;
+      this.tableData.currentPage = 1;
       this.getTableData(item, index);
     },
     async initData() {
+      this.tableData.currentPage = 1;
       await this.getEnvList();
       await this.getTableData();
     },
@@ -187,7 +293,7 @@ export default {
         appSystemId: this.appSystemId,
         appModuleId: this.appModuleId,
         envId: this.envId,
-        typeId: row && row.type ? row.type.id : null,
+        viewName: row && row.viewName ? row.viewName : null,
         currentPage: this.tableData.currentPage,
         pageSize: this.tableData.pageSize
       };
@@ -197,7 +303,7 @@ export default {
         return false;
       }
       this.loadingShow = true;
-      this.$api.cmdb.applicationManage.postAppmoduleResourceList(params).then(res => {
+      this.$api.cmdb.applicationManage.getAppResourceList(params).then(res => {
         if (res.Status == 'OK') {
           if (row && !this.$utils.isEmptyObj(row)) {
             // 内嵌列表翻页
@@ -221,21 +327,27 @@ export default {
     toCientityView(row) {
       // 应用清单详情
       if (row && !this.$utils.isEmptyObj(row)) {
-        this.$router.push({ path: './ci/' + row.typeId + '/cientity-view/' + row.id });
+        window.open(HOME + '/cmdb.html#/ci/' + row.ciId + '/cientity-view/' + row.id, '_blank');
+      }
+    },
+    toCiView(ci) {
+      if (ci && !this.$utils.isEmptyObj(ci)) {
+        window.open(HOME + '/cmdb.html#/ci-view/' + ci.id, '_blank');
       }
     },
     toInspectStatusDetail(row) {
       // 巡检状态详情
       if (row && !this.$utils.isEmptyObj(row)) {
-        if (this.moduleName == 'inspect') {
-          // inspect模块
-          this.$router.push({ path: './assets-detail-' + row.id});
-        } else {
-          // cmdb模块
-          this.$router.push({ path: './inspect-status-detail-' + row.id});
+        // cmdb模块
+        if (this.$AuthUtils.hasRole('INSPECT_BASE')) {
+          window.open(HOME + '/cmdb.html#/inspect.html#/inspect-status-detail-' + row.id, '_blank');
         }
       }
     },
+    toGlobalAttrManage() {
+      //全局属性管理
+      window.open(HOME + '/cmdb.html#/global-attr-manage', '_blank');
+    },
     selectedEnv(name) {
       let envId = null;
       this.envList.forEach(v => {
@@ -244,6 +356,7 @@ export default {
         }
       });
       this.envId = envId;
+      this.tableData.currentPage = 1;
       this.getTableData();
     },
     handleTimes(time) {
diff --git a/src/views/pages/cmdb/newapplication/ci-attr-setting-dialog.vue.vue b/src/views/pages/cmdb/application/ci-attr-setting-dialog.vue.vue
similarity index 100%
rename from src/views/pages/cmdb/newapplication/ci-attr-setting-dialog.vue.vue
rename to src/views/pages/cmdb/application/ci-attr-setting-dialog.vue.vue
diff --git a/src/views/pages/cmdb/newapplication/app-edit-dialog.vue b/src/views/pages/cmdb/newapplication/app-edit-dialog.vue
deleted file mode 100644
index 3f473a6b9..000000000
--- a/src/views/pages/cmdb/newapplication/app-edit-dialog.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-<template>
-  <TsDialog v-bind="setting" :isShow="true" @on-close="close">
-    <div>
-      <Loading
-        v-if="isLoading"
-        :text="$t('page.datasaving')"
-        :loadingShow="isLoading"
-        type="fix"
-      ></Loading>
-      <EditCiEntity
-        ref="editContainer"
-        mode="dialog"
-        :propCiId="ciId"
-        :propCiEntityId="ciEntityId"
-        :isRequired="1"
-        saveMode="emit"
-        :hideHeader="true"
-        @save="save"
-        @cancel="close"
-      ></EditCiEntity>
-    </div>
-  </TsDialog>
-</template>
-<script>
-import EditCiEntity from '@/views/pages/cmdb/cientity/cientity-edit.vue';
-export default {
-  name: '',
-  components: {
-    EditCiEntity
-  },
-  filters: {},
-  props: {
-    ciId: {
-      type: Number
-    },
-    ciEntityId: {
-      type: Number
-    }
-  },
-  data() {
-    return {
-      isLoading: false,
-      setting: {
-        title: this.ciEntityId ? this.$t('dialog.title.edittarget', {'target': this.$t('page.apply')}) : this.$t('dialog.title.addtarget', {'target': this.$t('page.apply')}),
-        maskClose: false,
-        width: 'large',
-        hasFooter: false
-      }
-    };
-  },
-  beforeCreate() {},
-  created() {
-  },
-  beforeMount() {},
-  mounted() {},
-  beforeUpdate() {},
-  updated() {},
-  activated() {},
-  deactivated() {},
-  beforeDestroy() {},
-  destroyed() {},
-  methods: {
-    close() {
-      this.$emit('close');
-    },
-    save(ciEntityList) {
-      this.isLoading = true;
-      this.$api.cmdb.cientity.batchSaveCiEntity({ciEntityList: ciEntityList, needCommit: true}).then(res => {
-        if (res.Status == 'OK') {
-          this.$Message.success(this.$t('message.savesuccess'));
-          this.$emit('close', true, !this.$utils.isEmpty(ciEntityList) ? ciEntityList[(ciEntityList.length - 1)].uuid : ''); // uuid 用于刷新数据
-        }
-      }).finally(() => {
-        this.isLoading = false;
-      });
-    }
-  },
-  computed: {},
-  watch: {}
-};
-</script>
-<style lang="less" scoped></style>
diff --git a/src/views/pages/cmdb/newapplication/app-module-tree.vue b/src/views/pages/cmdb/newapplication/app-module-tree.vue
deleted file mode 100644
index 4e80e1628..000000000
--- a/src/views/pages/cmdb/newapplication/app-module-tree.vue
+++ /dev/null
@@ -1,553 +0,0 @@
-<template>
-  <div>
-    <div class="pr-sm" :class="alignType == 'table' ? 'pt-xs' : ''">
-      <InputSearcher
-        v-model="searchParam.keyword"
-        border="bottom"
-        :placeholder="$t('form.placeholder.keyword')"
-        @change="searchAppSystem()"
-      ></InputSearcher>
-    </div>
-    <div ref="scroll">
-      <Loading v-if="isLoading" :loadingShow="true" type="fix"></Loading>
-      <Scroll
-        :on-reach-bottom="pageRange[1] < pageCount ? handleReachBottom : null"
-        :on-reach-top="pageRange[0] > 1 ? handleReachTop : null"
-        :loading-text="loadingTip"
-        :height="scrollHeight"
-        :distance-to-edge="10"
-      >
-        <div v-for="app in appSystemList" :key="app.id">
-          <div class="app-item pl-xs pb-xs pt-xs cursor radius-sm overflow" :class="{ 'item-selected': !!app.isSelected }" @click="selectApp(app)">
-            <span v-if="(level === 'module' || level === 'env') && app.isHasModule">
-              <span v-if="!app.isLoading" :class="{ 'tsfont-drop-right': !app.isExpand, 'tsfont-drop-down': !!app.isExpand }" @click.stop="showModule(app)"></span>
-              <Icon
-                v-else
-                type="ios-loading"
-                size="16"
-                class="loading"
-              ></Icon>
-            </span>
-            <span v-else class="tsfont-dot"></span>
-            <Tooltip class="tooltip-box" :content="app.abbrName + '（' + app.name + '）'" :transfer="true">
-              <span class="name-pl overflow">{{ app.abbrName }}{{ app.name ? '(' + app.name + ')' : '' }}</span>
-            </Tooltip>
-          </div>
-          <div v-if="app.isExpand && app.appModuleList && app.appModuleList.length > 0">
-            <div v-for="module in app.appModuleList" :key="module.id">
-              <div class="module-item ml-nm pb-xs pt-xs radius-sm overflow cursor module-flex" :class="{ 'item-selected': !!module.isSelected }" @click="selectModule(app, module)">
-                <span v-if="level === 'env' && module.isHasEnv">
-                  <span v-if="!module.isLoading" :class="{ 'tsfont-drop-right': !module.isExpand, 'tsfont-drop-down': !!module.isExpand }" @click.stop="showEnv(app, module)"></span>
-                  <Icon
-                    v-else
-                    type="ios-loading"
-                    size="16"
-                    class="loading"
-                  ></Icon>
-                </span>
-                <span v-else-if="level === 'env' && !module.isHasEnv" class="tsfont-dot"></span>
-                <span v-else class="tsfont-application"></span>
-                <Tooltip class="tooltip-box" :content="module.abbrName + (module.name ? '（' + module.name + '）' : '')" :transfer="true">
-                  <span class="name-pl overflow">{{ module.abbrName }}{{ module.name ? '(' + module.name +')' : '' }}</span>
-                </Tooltip>
-              </div>
-              <div v-if="module.isExpand && module.envList && module.envList.length > 0" class="ml-nm pb-xs pt-xs">
-                <Tag
-                  v-for="env in module.envList"
-                  :key="env.id"
-                  :color="env.isSelected ? 'primary' : 'default'"
-                  class="cursor"
-                  @click.native="selectEnv(app, module, env)"
-                >
-                  {{ env.name }}
-                </Tag>
-              </div>
-            </div>
-          </div>
-        </div>
-      </Scroll>
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  name: '',
-  components: {
-    InputSearcher: () => import('@/resources/components/InputSearcher/InputSearcher.vue')
-  },
-  props: {
-    offsetTop: {
-      //顶部间距
-      type: Number,
-      default: 0
-    },
-    offsetBottom: {
-      //底部间距
-      type: Number,
-      default: 20
-    },
-    level: { type: String, default: 'module' }, //展示级别，分别是app,module和env
-    value: { type: Object },
-    allowInverse: { type: Boolean, default: true }, //是否允许反选，不允许默认会选中第一个节点
-    filter: {
-      // 过滤条件
-      type: Object,
-      default: function() {
-        return {};
-      }
-    },
-    alignType: {
-      // 输入框底边线和右边对齐
-      type: String,
-      default: 'table' // table / tag
-    }
-  },
-  data() {
-    return {
-      returnValue: this.value || {},
-      searchParam: { keyword: '', pageSize: 50, ...this.filter }, //pagesize生成50，防止浏览器高度太大数据量太少不出现滚动条导致无法触发翻页
-      pageCount: 0,
-      selectedNode: null,
-      appSystemList: [],
-      scrollHeight: 0,
-      loadingTip: this.$t('page.loadingtip'),
-      selectedApp: null,
-      selectedModule: null,
-      selectedEnv: null,
-      isShowAppEdit: false,
-      isLoading: false,
-      isSearching: false, //是否正在搜索，滚动分页避免冲突，禁止并发搜索
-      pageRange: [1, 1] //数据页范围，由于是滚动分页，需要记录页码范围
-    };
-  },
-  beforeCreate() {},
-  async created() {
-    await this.searchAppSystem();
-    window.addEventListener('resize', this.calcScrollHeight);
-  },
-  beforeMount() {},
-  mounted() {
-    setTimeout(() => {
-      this.calcScrollHeight();
-    }, 300);
-  },
-  beforeUpdate() {},
-  updated() {},
-  activated() {},
-  deactivated() {},
-  beforeDestroy() {
-    window.removeEventListener('resize', this.calcScrollHeight);
-  },
-  destroyed() {},
-  methods: {
-    //disableEmit为true,禁止触发外部搜索，只会改变节点的选中状态，此参数的目的是在回退后的首次加载中，避免连续触发两次搜索
-    async reSelectNode(disableEmit) {
-      let isHit = false;
-      if (!this.$utils.isEmpty(this.returnValue)) {
-        const appId = this.returnValue.appId;
-        const moduleId = this.returnValue.moduleId;
-        const envId = this.returnValue.envId;
-
-        if (appId && !moduleId && !envId) {
-          //选中应用
-          const appNode = this.appSystemList.find(d => d.id === appId);
-          if (appNode) {
-            if (!appNode.isSelected) {
-              this.selectApp(appNode, disableEmit);
-            }
-            isHit = true;
-          }
-        } else if (appId && moduleId && !envId) {
-          //选中模块
-          const appNode = this.appSystemList.find(d => d.id === appId);
-          if (appNode && !appNode.isExpand) {
-            await this.showModule(appNode);
-          }
-          if (appNode) {
-            const moduleNode = appNode.appModuleList.find(d => d.id === moduleId);
-            if (moduleNode) {
-              if (!moduleNode.isSelected) {
-                this.selectModule(appNode, moduleNode, disableEmit);
-              }
-              isHit = true;
-            }
-          }
-        } else if (appId && moduleId && envId) {
-          //选中环境
-          const appNode = this.appSystemList.find(d => d.id === appId);
-          if (appNode && !appNode.isExpand) {
-            await this.showModule(appNode);
-          }
-          if (appNode) {
-            const moduleNode = appNode.appModuleList.find(d => d.id === moduleId);
-            if (moduleNode && !moduleNode.isExpand) {
-              // await this.showEnv(appNode, moduleNode);
-            }
-            if (moduleNode) {
-              const envNode = moduleNode.envList.find(d => d.id === envId);
-              if (envNode) {
-                if (!envNode.isSelected) {
-                  this.selectEnv(appNode, moduleNode, envNode, disableEmit);
-                }
-                isHit = true;
-              }
-            }
-          }
-        }
-      }
-      if (!isHit) {
-        //找不到选中的值则清空当前选中数据
-        this.clearSelectedItem();
-        if (!this.allowInverse && this.appSystemList && this.appSystemList.length > 0) {
-          const app = this.appSystemList[0];
-          this.selectApp(app, disableEmit);
-        } else {
-          if (!disableEmit) {
-            this.emit();
-          }
-        }
-      }
-    },
-    calcScrollHeight() {
-      this.scrollHeight = document.body.clientHeight - this.$refs['scroll'].getBoundingClientRect().top - this.offsetBottom;
-    },
-    emit() {
-      this.$addHistoryData('appModuleEnvData', this.returnValue);
-      this.$emit('input', this.returnValue);
-      this.$emit('getSelectedApp', this.selectedApp);
-      this.$emit('getSelectedModule', this.selectedModule);
-      this.$emit('getSelectedEnv', this.selectedEnv);
-    },
-    restoreHistory(historyData) {
-      this.searchParam = historyData['searchParam'];
-      if (historyData['pageRange']) {
-        this.searchParam.pageRange = historyData['pageRange'];
-      }
-      this.returnValue = historyData['appModuleEnvData'] || {};
-    },
-    clearSelectedItem() {
-      if (this.selectedApp) {
-        this.$set(this.selectedApp, 'isSelected', false);
-        this.selectedApp = null;
-      }
-      if (this.selectedModule) {
-        this.$set(this.selectedModule, 'isSelected', false);
-        this.selectedModule = null;
-      }
-      if (this.selectedEnv) {
-        this.$set(this.selectedEnv, 'isSelected', false);
-        this.selectedEnv = null;
-      }
-      if (this.returnValue && this.returnValue.appId) {
-        this.$delete(this.returnValue, 'appId');
-      }
-      if (this.returnValue && this.returnValue.moduleId) {
-        this.$delete(this.returnValue, 'moduleId');
-      }
-      if (this.returnValue && this.returnValue.envId) {
-        this.$delete(this.returnValue, 'envId');
-      }
-    },
-    selectApp(app, disableEmit) {
-      if (app.isSelected) {
-        if (this.allowInverse) {
-          this.clearSelectedItem();
-        }
-      } else {
-        this.clearSelectedItem();
-        this.selectedApp = app;
-        this.$set(app, 'isSelected', true);
-        this.$set(this.returnValue, 'appId', app.id);
-        this.emit(); // 详情页返回，缺少分发方法
-      }
-      if (!disableEmit) {
-        this.emit();
-      }
-    },
-    selectModule(app, module, disableEmit) {
-      if (module.isSelected) {
-        if (this.allowInverse) {
-          this.clearSelectedItem();
-        }
-      } else {
-        this.clearSelectedItem();
-        this.selectedApp = app;
-        this.selectedModule = module;
-        this.$set(module, 'isSelected', true);
-        this.$set(this.returnValue, 'appId', app.id);
-        this.$set(this.returnValue, 'moduleId', module.id);
-        this.emit(); // 详情页返回，缺少分发的方法
-      }
-      if (!disableEmit) {
-        this.emit();
-      }
-    },
-    //提供给外部使用，用于刷新某个app下的所有节点（删除模块时使用）
-    async refreshAppByDelModule(appSystemId) {
-      if (appSystemId) {
-        await this.$api.cmdb.applicationManage.getAppmoduleListTree({ appSystemId: appSystemId }).then(res => {
-          const appModuleList = res.Return && !this.$utils.isEmpty(res.Return) ? res.Return : [];
-          const index = this.appSystemList.findIndex(d => d.id === appSystemId);
-          if (index > -1) {
-            this.$set(this.appSystemList[index], 'isHasModule', this.$utils.isEmpty(appModuleList) ? 0 : 1);
-            this.$set(this.appSystemList[index], 'appModuleList', appModuleList);
-          }
-          this.returnValue = {
-            appId: appSystemId
-          };
-          this.reSelectNode();
-        });
-      }
-    },
-    //提供给外部使用，用于刷新某个app下的所有节点（新增是使用）
-    async refreshApp(uuid) {
-      if (uuid) {
-        await this.$api.cmdb.applicationManage.getAppsystemById({ uuid: uuid }).then(res => {
-          const newAppNode = res.Return && !this.$utils.isEmptyObj(res.Return) ? res.Return : {};
-          const {id = null, abbrName = '', name = ''} = newAppNode;
-          const index = this.appSystemList.findIndex(d => d.id === id);
-          if (index > -1) {
-            const newAppObj = Object.assign(this.appSystemList[index], {id: id, name: name, abbrName: abbrName});
-            this.$set(this.appSystemList, index, newAppObj);
-            this.reSelectNode();
-          } else {
-            this.appSystemList.unshift(newAppNode); // 添加应用时，把应用放在数组第一个
-            this.selectApp(newAppNode);
-          }
-        });
-      }
-    },
-    //提供给外部使用，用于刷新某个module下的所有节点
-    async refreshModule(uuid, appSystemId) {
-      let moduleId = null;
-      if (uuid) {
-        await this.$api.cmdb.applicationManage.getAppmoduleById({ uuid: uuid }).then((res) => {
-          if (res && res.Status == 'OK' && res.Return) {
-            moduleId = res.Return.id;
-          }
-        });
-        const index = this.appSystemList.findIndex(d => d.id === appSystemId);
-        if (index > -1) {
-          await this.$api.cmdb.applicationManage.getAppmoduleListTree({ appSystemId: appSystemId }).then(res => {
-            const newModuleNode = res.Return && !this.$utils.isEmpty(res.Return) ? res.Return : [];
-            if (newModuleNode) {
-              this.$set(this.appSystemList[index], 'isHasModule', this.$utils.isEmpty(newModuleNode) ? 0 : 1); // 新加(删除)模块后，更新应用状态
-              this.$set(this.appSystemList[index], 'appModuleList', newModuleNode);
-              this.returnValue = {
-                appId: appSystemId,
-                moduleId: moduleId
-              };
-              this.reSelectNode();
-            }
-          });
-        }
-      }
-    },
-    selectEnv(app, module, env, disableEmit) {
-      if (env.isSelected) {
-        if (this.allowInverse) {
-          this.clearSelectedItem();
-        }
-      } else {
-        this.clearSelectedItem();
-        this.selectedApp = app;
-        this.selectedModule = module;
-        this.selectedEnv = env;
-        this.$set(env, 'isSelected', true);
-        this.$set(this.returnValue, 'appId', app.id);
-        this.$set(this.returnValue, 'moduleId', module.id);
-        this.$set(this.returnValue, 'envId', env.id);
-        this.emit(); // 详情页返回，缺少分发方法
-      }
-      if (!disableEmit) {
-        this.emit();
-      }
-    },
-    async showModule(app) {
-      if (!app.isExpand) {
-        this.$set(app, 'isLoading', true);
-        await this.$api.cmdb.applicationManage
-          .getAppmoduleListTree({ appSystemId: app.id })
-          .then(res => {
-            if (res.Status == 'OK') {
-              this.$set(app, 'appModuleList', res.Return);
-              this.$set(app, 'isExpand', true);
-            }
-          })
-          .finally(() => {
-            this.$set(app, 'isLoading', false);
-          });
-      } else {
-        this.$set(app, 'isExpand', false);
-      }
-    },
-    // async showEnv(app, module) { // 先注释，目前用不到，环境层数据
-    //   if (!module.isExpand) {
-    //     this.$set(module, 'isLoading', true);
-    //     let params = {
-    //       appSystemId: app.id,
-    //       appModuleId: module.id,
-    //       isHasEnv: 1
-    //     };
-    //     await this.$api.deploy.applicationConfig
-    //       .getEnvTreeList(params)
-    //       .then(res => {
-    //         if (res && res.Status == 'OK') {
-    //           const envList = res.Return || [];
-    //           this.$set(module, 'envList', envList);
-    //           this.$set(module, 'isExpand', true);
-    //         }
-    //       })
-    //       .finally(() => {
-    //         this.$set(module, 'isLoading', false);
-    //       });
-    //   } else {
-    //     this.$set(module, 'isExpand', false);
-    //   }
-    // },
-    async searchAppSystem(direction) {
-      if (!this.isSearching) {
-        this.isSearching = true;
-        if (!direction) {
-          this.isLoading = true;
-          this.searchParam.currentPage = 1;
-        } else if (direction === 'down') {
-          this.searchParam.currentPage = this.pageRange[1] + 1;
-        } else if (direction === 'up') {
-          this.searchParam.currentPage = Math.max(1, this.pageRange[0] - 1);
-          if (this.pageRange[0] === this.searchParam.currentPage) {
-            this.isSearching = false;
-            return; //如果已经是第一页，则不再搜索
-          }
-        }
-        this.$addHistoryData('searchParam', this.searchParam);
-        await this.$api.cmdb.applicationManage
-          .getAppsystemListTree(this.searchParam)
-          .then(async res => {
-            if (res && res.Status == 'OK') {
-              const dataList = res.Return.tbodyList || [];
-              this.pageCount = res.Return.pageCount;
-              const currentPage = Math.min(this.pageCount, this.searchParam.currentPage);
-              if (dataList && dataList.length > 0) {
-                if (this.level === 'module' || this.level === 'env') {
-                  dataList.forEach(element => {
-                    if (element.appModuleList && element.appModuleList.length > 0) {
-                      this.$set(element, 'isExpand', true);
-                    }
-                  });
-                }
-                let appSystemIdList = [];
-                this.appSystemList &&
-                  this.appSystemList.forEach(item => {
-                    appSystemIdList.push(item.id);
-                  });
-                if (!direction) {
-                  this.appSystemList = dataList;
-                  if (this.searchParam.pageRange) {
-                    //第一次搜索完毕后需要清除pageRange参数，并且把当前页面设回正确的值
-                    this.searchParam.currentPage = this.searchParam.pageRange[1];
-                    this.pageRange = this.searchParam.pageRange;
-                    this.$delete(this.searchParam, 'pageRange');
-                  } else {
-                    this.pageRange = [currentPage, currentPage];
-                  }
-                } else if (direction === 'down') {
-                  dataList &&
-                    dataList.forEach(item => {
-                      // 添加应用后，处理下拉数据重复问题
-                      if (!appSystemIdList.includes(item.id)) {
-                        this.appSystemList.push(item);
-                      }
-                    });
-                  this.pageRange[1] = currentPage;
-                } else if (direction === 'up') {
-                  dataList &&
-                    dataList.forEach(item => {
-                      // 添加应用后，处理下拉数据重复问题
-                      if (!appSystemIdList.includes(item.id)) {
-                        this.appSystemList.unshift(item);
-                      }
-                    });
-                  this.pageRange[0] = currentPage;
-                }
-              } else {
-                if (!direction) {
-                  this.appSystemList = [];
-                  this.pageRange = [currentPage, currentPage];
-                }
-              }
-              this.$emit('getAppSystemIdList', this.appSystemList);
-              //重新选中节点，禁用emit，防止触发二次搜索
-              await this.reSelectNode(true);
-            }
-          })
-          .finally(() => {
-            this.isSearching = false;
-            this.isLoading = false;
-            this.$addHistoryData('pageRange', this.pageRange);
-          })
-          .catch(() => {
-            this.$emit('getAppSystemIdList', []);
-          });
-      }
-    },
-    handleReachBottom() {
-      this.searchAppSystem('down');
-    },
-    handleReachTop() {
-      if (this.pageRange[0] > 1) {
-        this.searchAppSystem('up');
-      } else {
-        return false;
-      }
-    }
-  },
-  filter: {},
-  computed: {},
-  watch: {
-    height: {
-      handler(val) {
-        this.scrollHeight = val;
-      },
-      immediate: true
-    },
-    value: {
-      async handler(val) {
-        this.returnValue = val || {};
-        await this.reSelectNode();
-      },
-      deep: true
-    }
-  }
-};
-</script>
-<style lang="less" scoped>
-.app-item {
-  position: relative;
-  display: flex;
-}
-.app-item .favorite-icon {
-  position: absolute;
-  right: 0px;
-  visibility: hidden;
-}
-.app-item:hover .favorite-icon {
-  visibility: visible;
-}
-.name-pl {
-  display: inline-block;
-  width: 100%;
-  padding-left: 4px;
-  padding-right: 32px;
-}
- .tooltip-box {
-    /deep/ &.ivu-tooltip,
-    /deep/ .ivu-tooltip-rel {
-      max-width: 100%;
-      width: 100%;
-    }
-}
-.module-flex {
-  display: flex;
-}
-</style>
diff --git a/src/views/pages/cmdb/newapplication/application-manage.vue b/src/views/pages/cmdb/newapplication/application-manage.vue
deleted file mode 100644
index 9fb6c6353..000000000
--- a/src/views/pages/cmdb/newapplication/application-manage.vue
+++ /dev/null
@@ -1,253 +0,0 @@
-<template>
-  <div>
-    <TsContain :siderWidth="220">
-      <template v-slot:topLeft>
-        <div class="action-group">
-          <span v-if="$AuthUtils.hasRole('RESOURCECENTER_MODIFY')" class="action-item tsfont-plus" @click="addApp()">{{ $t('page.apply') }}</span>
-          <span v-if="$AuthUtils.hasRole('RESOURCECENTER_MODIFY')" class="action-item tsfont-plus" @click="addAppModule()">{{ $t('page.module') }}</span>
-          <span class="action-item tsfont-plus" @click="addSettingDialog()">{{ $t('page.setting') }}</span>
-        </div>
-      </template>
-      <template v-slot:topRight>
-        <div v-if="$AuthUtils.hasRole('RESOURCECENTER_MODIFY') && selectedApp && !selectedModule" class="action-group">
-          <span class="action-item tsfont-edit" @click="editApp()">{{ $t('page.apply') }}</span>
-          <span class="action-item tsfont-trash-o" @click="deleteApp()">{{ $t('page.apply') }}</span>
-        </div>
-        <div v-else-if="$AuthUtils.hasRole('RESOURCECENTER_MODIFY')" class="action-group">
-          <span class="action-item tsfont-edit" @click="editAppModule()">{{ $t('page.module') }}</span>
-          <span class="action-item tsfont-trash-o" @click="deleteAppModule()">{{ $t('page.module') }}</span>
-        </div>
-      </template>
-      <template v-slot:sider>
-        <AppModuleTree
-          ref="appModuleTree"
-          v-model="appModueData"
-          :allowInverse="false"
-          @getSelectedApp="getSelectedApp"
-          @getSelectedModule="getSelectedModule"
-        ></AppModuleTree>
-      </template>
-      <template v-slot:content>
-        <Tabs v-model="tabValue" :animated="false" class="block-tabs">
-          <TabPane :label="$t('term.inspect.assetlist')" name="assetsList">
-            <AssetsManage
-              v-if="tabValue == 'assetsList'"
-              ref="assetsManage"
-              class="assets-manage-box"
-              :appSystemId="appSystemId"
-              :appModuleId="appModuleId"
-            ></AssetsManage>
-          </TabPane>
-          <TabPane v-if="selectedApp && !selectedModule" :label="$t('term.deploy.applicationinformation')" name="applicationInfo">
-            <AppInfo v-if="tabValue == 'applicationInfo'" :appSystemId="appSystemId"></AppInfo>
-          </TabPane>
-          <TabPane v-else :label="$t('term.deploy.moduleinformation')" name="moduleInfo">
-            <ModuleInfo
-              v-if="tabValue == 'moduleInfo'"
-              :isShowTitle="false"
-              :appSystemId="appSystemId"
-              :appModuleId="appModuleId"
-            ></ModuleInfo>
-          </TabPane>
-        </Tabs>
-      </template>
-    </TsContain>
-    <AppEditDialog
-      v-if="isEditAppDialogShow"
-      :ciEntityId="appCiEntityId"
-      :ciId="appCiId"
-      @close="closeAppEditDialog"
-    ></AppEditDialog>
-    <AppModuleEditDialog
-      v-if="isEditAppModuleDialogShow"
-      :ciEntityId="appModuleCiEntityId"
-      :ciId="appModuleCiId"
-      :ciEntityData="ciEntityData"
-      @close="closeAppModuleEditDialog"
-    ></AppModuleEditDialog>
-    <DeleteCiEntityDialog
-      v-if="isDeleteDialogShow"
-      :allowDelete="true"
-      :allowCommit="true"
-      :ciEntityId="deleteCiEntityId"
-      @close="closeDeleteDialog"
-    ></DeleteCiEntityDialog>
-    <CiAttrSettingDialog v-if="isSettingDialogShow" @close="closeSettingDialog"></CiAttrSettingDialog>
-  </div>
-</template>
-<script>
-export default {
-  name: '',
-  components: {
-    AppInfo: () => import('@/views/pages/deploy/application-config/config/app/app-info.vue'),
-    ModuleInfo: () => import('@/views/pages/deploy/application-config/config/module/module-info'),
-    AppEditDialog: () => import('./app-edit-dialog.vue'),
-    AppModuleEditDialog: () => import('./appmodule-edit-dialog.vue'),
-    DeleteCiEntityDialog: () => import('../cientity/cientity-delete-dialog.vue'),
-    AssetsManage: () => import('./assets-manage'), // 资产清单
-    AppModuleTree: () => import('./app-module-tree'), // 应用模块树
-    CiAttrSettingDialog: () => import('./ci-attr-setting-dialog.vue')
-  },
-  props: {},
-  data() {
-    return {
-      tabValue: '',
-      isApp: true,
-      isEditAppDialogShow: false,
-      isEditAppModuleDialogShow: false,
-      isDeleteDialogShow: false,
-      appCiEntityId: null,
-      appCiId: null,
-      appSystemId: null, // 系统id
-      appModuleCiId: null,
-      appModuleId: null,
-      deleteCiEntityId: null,
-      selectedApp: null,
-      selectedModule: null,
-      appModueData: {},
-      ciEntityData: {}, // 添加模块时，用于锁定应用
-      isSettingDialogShow: false 
-
-    };
-  },
-  beforeCreate() {},
-  created() {
-    this.getResourceEntity();
-  },
-  beforeMount() {},
-  mounted() {},
-  beforeUpdate() {},
-  updated() {},
-  activated() {},
-  deactivated() {},
-  beforeDestroy() {},
-  destroyed() {},
-  methods: {
-    getSelectedApp(app) {
-      this.selectedApp = app;
-      this.appCiEntityId = app ? app.id : null;
-      this.appSystemId = app ? app.id : null;
-      this.tabValue = 'assetsList';
-    },
-    getSelectedModule(module) {
-      this.selectedModule = module;
-      this.appModuleId = module ? module.id : null;
-      this.tabValue = 'assetsList';
-    },
-    addApp() {
-      this.appCiEntityId = null;
-      this.isEditAppDialogShow = true;
-    },
-    editApp() {
-      this.appCiEntityId = this.selectedApp ? this.selectedApp.id : null;
-      this.isEditAppDialogShow = true;
-    },
-    editAppModule() {
-      this.ciEntityData = {};
-      this.appModuleCiEntityId = this.appModuleId;
-      this.isEditAppModuleDialogShow = true;
-    },
-    async addAppModule() {
-      await this.getRelEntityData();
-      this.appModuleCiEntityId = null;
-      this.isEditAppModuleDialogShow = true;
-    },
-    deleteApp() {
-      this.deleteCiEntityId = this.appSystemId;
-      this.isDeleteDialogShow = true;
-    },
-    deleteAppModule() {
-      this.deleteCiEntityId = this.appModuleId;
-      this.isDeleteDialogShow = true;
-    },
-    closeAppEditDialog(needRefresh, uuid) {
-      this.isEditAppDialogShow = false;
-      if (needRefresh && uuid) {
-        // 添加应用成功，刷新树列表
-        this.$refs.appModuleTree.refreshApp(uuid);
-      }
-    },
-    closeAppModuleEditDialog(needRefresh, uuid) {
-      this.isEditAppModuleDialogShow = false;
-      if (needRefresh && uuid) {
-        // 添加编辑模块成功，刷新树列表
-        this.$refs.appModuleTree.refreshModule(uuid, this.appSystemId);
-      }
-    },
-    closeDeleteDialog(needRefresh) {
-      this.isDeleteDialogShow = false;
-      if (needRefresh) {
-        if (this.appModuleId) {
-          // 删除模块后，刷新树列表
-          this.$refs.appModuleTree.refreshAppByDelModule(this.appSystemId);
-        } else if (this.appSystemId) {
-          // 删除应用成功，刷新树列表
-          this.$refs.appModuleTree.searchAppSystem();
-        }
-      }
-    },
-    getResourceEntity() {
-      this.$api.cmdb.applicationManage.getResourceEntityByName('scence_appsystem').then(res => {
-        if (res.Return && res.Return.ciId) {
-          this.appCiId = res.Return.ciId;
-        }
-      });
-      this.$api.cmdb.applicationManage.getResourceEntityByName('scence_appmodule').then(res => {
-        if (res.Return && res.Return.ciId) {
-          this.appModuleCiId = res.Return.ciId;
-        }
-      });
-    },
-    async getRelEntityData() {
-      // 设置添加模块时，默认选中当前应用
-      this.ciEntityData = {};
-      if (this.appModuleCiId) {
-        let relList = [];
-        let relEntityData = {};
-        await this.$api.cmdb.ci
-          .getRelByCiId(this.appModuleCiId, {
-            needAction: false,
-            showType: 'all'
-          })
-          .then(res => {
-            relList = res.Return || [];
-            relList.forEach(element => {
-              if ((element.direction === 'from' && element.fromCiId == this.appModuleCiId && element.toCiId == this.appCiId) || (element.direction === 'to' && element.toCiId == this.appModuleCiId && element.fromCiId == this.appCiId)) {
-                relEntityData[`rel${element.direction}_${element.id}`] = {
-                  valueList: [
-                    {
-                      ciEntityName: this.selectedApp.name, // 应用层的name
-                      ciEntityId: this.selectedApp.id, // 应用的id
-                      ciId: this.appModuleCiId
-                    }
-                  ]
-                };
-              }
-            });
-            this.ciEntityData = { uuid: this.$utils.setUuid(), relEntityData: relEntityData };
-          });
-      }
-    },
-    addSettingDialog() {
-      this.isSettingDialogShow = true;
-    },
-    closeSettingDialog(needRefresh) {
-      this.isSettingDialogShow = false;
-      if (needRefresh) {
-        if (this.tabValue === 'assetsList') {
-          this.$refs.assetsManage.initData();
-        }
-      }
-    }
-  },
-  filter: {},
-  computed: {},
-  watch: {}
-};
-</script>
-<style lang="less" scoped>
-.assets-manage-box {
-  height: calc(100vh - 100px - 50px); // 100 通栏的表头+导航栏， 50是（tab(高度)+16(底部的间距)
-  overflow-y: auto;
-}
-</style>
diff --git a/src/views/pages/cmdb/newapplication/appmodule-edit-dialog.vue b/src/views/pages/cmdb/newapplication/appmodule-edit-dialog.vue
deleted file mode 100644
index 0876ca9e6..000000000
--- a/src/views/pages/cmdb/newapplication/appmodule-edit-dialog.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <TsDialog v-bind="setting" :isShow="true" @on-close="close">
-    <div>
-      <Loading
-        v-if="isLoading"
-        :text="$t('page.datasaving')"
-        :loadingShow="isLoading"
-        type="fix"
-      ></Loading>
-      <EditCiEntity
-        ref="editContainer"
-        mode="dialog"
-        :propCiId="ciId"
-        :propCiEntityId="ciEntityId"
-        :propCiEntityData="ciEntityData"
-        :isRequired="1"
-        saveMode="emit"
-        :hideHeader="true"
-        @save="save"
-        @cancel="close"
-      ></EditCiEntity>
-    </div>
-  </TsDialog>
-</template>
-<script>
-import EditCiEntity from '@/views/pages/cmdb/cientity/cientity-edit.vue';
-export default {
-  name: '',
-  components: {
-    EditCiEntity
-  },
-  filters: {},
-  props: {
-    ciId: {
-      type: Number
-    },
-    ciEntityId: {
-      type: Number
-    },
-    ciEntityData: {
-      type: Object,
-      default: () => ({})
-    }
-  },
-  data() {
-    return {
-      isLoading: false,
-      setting: {
-        title: this.ciEntityId ? '编辑应用模块' : '添加应用模块',
-        maskClose: false,
-        width: 'large',
-        hasFooter: false
-      }
-    };
-  },
-  beforeCreate() {},
-  created() {
-  },
-  beforeMount() {},
-  mounted() {},
-  beforeUpdate() {},
-  updated() {},
-  activated() {},
-  deactivated() {},
-  beforeDestroy() {},
-  destroyed() {},
-  methods: {
-    close() {
-      this.$emit('close');
-    },
-    save(ciEntityList) {
-      this.isLoading = true;
-      this.$api.cmdb.cientity.batchSaveCiEntity({ciEntityList: ciEntityList, needCommit: true}).then(res => {
-        if (res.Status == 'OK') {
-          this.$Message.success(this.$t('message.savesuccess'));
-          this.$emit('close', true, !this.$utils.isEmpty(ciEntityList) ? ciEntityList[0].uuid : '');
-        }
-      }).finally(() => {
-        this.isLoading = false;
-      });
-    }
-  },
-  computed: {},
-  watch: {}
-};
-</script>
-<style lang="less" scoped></style>
diff --git a/src/views/pages/cmdb/newapplication/assets-manage.vue b/src/views/pages/cmdb/newapplication/assets-manage.vue
deleted file mode 100644
index 6631aebdf..000000000
--- a/src/views/pages/cmdb/newapplication/assets-manage.vue
+++ /dev/null
@@ -1,394 +0,0 @@
-<template>
-  <div class="assets-manage-wrap padding">
-    <Loading :loadingShow="loadingShow" type="fix"></Loading>
-    <div v-if="envList && envList.length > 0" class="pb-sm li-box">
-      <Row :gutter="16">
-        <Col
-          v-for="item in envList"
-          :key="item.id"
-          :xs="12"
-          :sm="8"
-          :md="6"
-          :lg="4"
-          :xl="3"
-          :xxl="2"
-        >
-          <div
-            v-if="item.name"
-            class="li-item text-action"
-            :class="envId == item.id ? 'li-active li-text border-primary' : 'border-base bg-op'"
-            @click="selectedEnv(item.name)"
-          >{{ item.name }}</div>
-        </Col>
-      </Row>
-    </div>
-    <div v-if="tableList && tableList.length > 0 ">
-      <div v-for="(item, index) in tableList" :key="index">
-        <div class="h3 padding-sm">{{ item.viewLabel }}</div>
-        <TsTable
-          :fixedHeader="false"
-          :theadList="item.theadList"
-          v-bind="filterTypeFields(item)"
-          @changeCurrent="(currentPage) => changeCurrent(currentPage, item, index)"
-          @changePageSize="(pageSize) => changePageSize(pageSize,item, index)"
-        >
-          <template v-slot:ip="{ row }">
-            <span v-if="!$utils.isEmpty(row.ip)" class="text-href" @click="toCientityView(row.ip)">
-              <span>{{ row.ip.ip }}</span>
-              <span v-if="row.ip.port">:{{ row.ip.port }}</span>
-            </span>
-            <span v-else></span>
-          </template>
-          <template v-slot:allIpList="{ row }">
-            <div v-if="!$utils.isEmpty(row.allIpList)">
-              <Tag
-                v-for="(v, vindex) in row.allIpList"
-                :key="vindex"
-                class="cursor-pointer"
-                @click.native="toCientityView(v)"
-              >
-                {{ v.name }}
-              </Tag>
-            </div>
-            <div v-else></div>
-          </template>
-          <template v-slot:lcu="{row}">
-            <UserCard v-bind="row.lcu" :hideAvatar="true"></UserCard>
-          </template>
-          <template v-slot:fcu="{ row }">
-            <UserCard v-bind="row.fcu" :hideAvatar="true"></UserCard>
-          </template>
-          <template v-slot:vendor="{ row }">
-            <Tag
-              v-if="!$utils.isEmpty(row.vendor)"
-              class="cursor-pointer"
-              @click.native="toCientityView(row.vendor)"
-            >
-              {{ row.vendor.name }}
-            </Tag>
-            <span v-else></span>
-          </template>
-          <template v-slot:monitor="{ row }">
-            <!-- 监控状态 -->
-            <span v-if="row.monitor && row.monitor.time" :title="row.monitor.time | formatDate">
-              <span :class="[row.monitor.cssClass, {'background-FATAL': row.monitor.value== 'FATAL'}]" class="vertical">{{ row.monitor.text }} </span>
-              <span class="text-title">
-                {{ handleTimes(row.monitor.time) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
-              </span>
-            </span>
-            <span v-else></span>
-          </template>
-          <template v-slot:inspect="{ row }">
-            <!-- 巡检状态 -->
-            <span v-if="row.inspect && row.inspect.time" :title="row.inspect.time | formatDate">
-              <span :class="[row.inspect.cssClass, {'background-FATAL': row.inspect.value== 'FATAL'}]" class="vertical cursor" @click="toInspectStatusDetail(row)">{{ row.inspect.text }} </span>
-              <span class="text-title">
-                {{ handleTimes(row.inspect.time) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
-              </span>
-            </span>
-            <span v-else>-</span>
-          </template>
-          <template v-slot:appModule="{ row }">
-            <div v-if="!$utils.isEmpty(row.appModule)" class="text-href" @click="toCientityView(row.appModule)">
-              <span :class="row.appModule.ciIcon"></span>
-              <span>{{ row.appModule.name }}</span>
-            </div>
-          </template>
-          <template v-slot:appEnvironment="{ row }">
-            <Tag
-              v-if="!$utils.isEmpty(row.appEnvironment)"
-              class="cursor-pointer"
-              @click.native="toGlobalAttrManage()"
-            >
-              {{ row.appEnvironment.value }}
-            </Tag>
-          </template>
-          <template v-slot:appSystem="{row}">
-            <!-- 应用系统 -->
-            <div v-if="!$utils.isEmpty(row.appSystem)" class="text-href" @click="toCientityView(row.appSystem)">
-              <span :class="row.appSystem.ciIcon"></span>
-              <span>{{ row.appSystem.name }}</span>
-            </div>
-          </template>
-          <template v-slot:businessGroupList="{ row }">
-            <div v-if="!$utils.isEmpty(row.businessGroupList)">
-              <Tag
-                v-for="(b, bindex) in row.businessGroupList"
-                :key="bindex"
-                class="cursor-pointer"
-                @click.native="toCientityView(b)"
-              >
-                {{ b.name }}
-              </Tag>
-            </div>
-            <div v-else></div>
-          </template>
-          <template v-slot:state="{row}">
-            <!-- 资产状态 -->
-            <Tag
-              v-if="!$utils.isEmpty(row.state)"
-              class="cursor-pointer"
-              @click.native="toCientityView(row.state)"
-            >
-              {{ row.state.name }}
-            </Tag>
-          </template>
-          <template v-slot:ownerList="{ row }">
-            <div v-if="!$utils.isEmpty(row.ownerList)">
-              <Tag
-                v-for="(o, oindex) in row.ownerList"
-                :key="oindex"
-                class="cursor-pointer"
-                @click.native="toCientityView(o);"
-              >
-                {{ o.name }}
-              </Tag>
-            </div>
-            <div v-else></div>
-          </template>
-          <template v-slot:ci="{row}">
-            <!-- 模型 -->
-            <div v-if="!$utils.isEmpty(row.ci)" class="text-href" @click="toCiView(row.ci)">
-              <span :class="row.ci.icon"></span>
-              <span>{{ row.ci.label }}</span>
-            </div>
-          </template>
-          <template v-slot:dataCenter="{ row }">
-            <!-- 数据中心 -->
-            <Tag
-              v-if="!$utils.isEmpty(row.dataCenter)"
-              class="cursor-pointer"
-              @click.native="toCientityView(row.dataCenter)"
-            >
-              {{ row.dataCenter.name }}
-            </Tag>
-            <span v-else></span>
-          </template>
-          <template v-slot:fcd="{ row }">
-            <div v-if="row.fcd">{{ row.fcd | formatDate }}</div>
-          </template>
-          <template v-slot:lcd="{ row }">
-            <div v-if="row.lcd">{{ row.lcd | formatDate }}</div>
-          </template>
-          <!-- <template v-slot:clusterName="{row}">
-            所在集群 
-            <span v-if="row" class="text-href" @click="gotoCluster(row)">{{ row.clusterName }}</span>
-          </template> -->
-        </TsTable>
-      </div>
-    </div>
-    <NoData v-else></NoData>
-  </div>
-</template>
-<script>
-export default {
-  name: '',
-  components: {
-    TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
-    UserCard: () => import('@/resources/components/UserCard/UserCard.vue')
-  },
-  filters: {},
-  props: {
-    appSystemId: {
-      type: Number,
-      default: null
-    },
-    appModuleId: {
-      type: Number,
-      default: null
-    },
-    moduleName: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      loadingShow: false,
-      envId: '',
-      envList: [],
-      tableList: [],
-      tableData: {
-        tbodyList: [],
-        rowNum: 0,
-        pageSize: 20,
-        currentPage: 1
-      }
-      // theadList: [
-      //   { key: 'ip', title: this.$t('page.ipaddress')},
-      //   { key: 'name', title: this.$t('page.name')},
-      //   { key: 'monitorStatus', title: this.$t('term.inspect.monitoringstate')},
-      //   { key: 'inspectStatus', title: this.$t('term.autoexec.inspectstatus')},
-      //   { key: 'stateName', title: this.$t('term.autoexec.assetstatus')},
-      //   { key: 'envName', title: this.$t('term.inspect.envname')},
-      //   { key: 'clusterName', title: this.$t('term.inspect.clustername')},
-      //   { key: 'dataCenterName', title: this.$t('term.inspect.datacenter')},
-      //   { key: 'networkArea', title: this.$t('page.networkarea')},
-      //   { key: 'ownerList', title: this.$t('page.owner')},
-      //   { key: 'bgList', title: this.$t('term.autoexec.subordinatedepartment')},
-      //   { key: 'maintenanceWindow', title: this.$t('term.deploy.maintenancewindow')}
-      // ]
-    };
-  },
-  beforeCreate() {},
-  async created() {
-    await this.initData();
-  },
-  beforeMount() {},
-  mounted() {},
-  beforeUpdate() {},
-  updated() {},
-  activated() {},
-  deactivated() {},
-  beforeDestroy() {},
-  destroyed() {},
-  methods: {
-    restoreHistory(historyData) {
-      this.envId = historyData['envId'];
-    },
-    filterTypeFields(row) {
-      // 过滤类型字段，修复控制台报错问题
-      let currentRow = this.$utils.deepClone(row);
-      if (currentRow && currentRow.hasOwnProperty('type')) {
-        delete currentRow.type;
-      }
-      return currentRow;
-    },
-    changeCurrent(currentPage, item, index) {
-      this.tableData.currentPage = currentPage;
-      this.getTableData(item, index);
-    },
-    changePageSize(pageSize, item, index) {
-      this.tableData.pageSize = pageSize;
-      this.tableData.currentPage = 1;
-      this.getTableData(item, index);
-    },
-    async initData() {
-      this.tableData.currentPage = 1;
-      await this.getEnvList();
-      await this.getTableData();
-    },
-    async getEnvList() {
-      this.loadingShow = true;
-      await this.$api.cmdb.applicationManage.getEnvironmenteList().then(res => {
-        if (res.Status == 'OK') {
-          this.envList = res.Return?.tbodyList || [];
-          this.envList.unshift({
-            name: this.$t('term.inspect.allenv'),
-            id: ''
-          });
-          this.envList.push({
-            name: this.$t('term.inspect.noconfigenv'),
-            id: -2
-          });
-          this.envId = this.envId || '';
-        }
-      }).finally(() => {
-        this.loadingShow = false;
-      });
-    },
-    getTableData(row, index) {
-      let currentRow = {};
-      let params = {
-        appSystemId: this.appSystemId,
-        appModuleId: this.appModuleId,
-        envId: this.envId,
-        viewName: row && row.viewName ? row.viewName : null,
-        currentPage: this.tableData.currentPage,
-        pageSize: this.tableData.pageSize
-      };
-      this.$addHistoryData('envId', this.envId);
-      if (this.$utils.isEmpty(this.appSystemId) && this.$utils.isEmpty(this.appModuleId)) {
-        this.tableList = [];
-        return false;
-      }
-      this.loadingShow = true;
-      this.$api.cmdb.applicationManage.getAppResourceList(params).then(res => {
-        if (res.Status == 'OK') {
-          if (row && !this.$utils.isEmptyObj(row)) {
-            // 内嵌列表翻页
-            let tableList = (res.Return && res.Return.tableList) ? res.Return.tableList[0] : [];
-            currentRow = Object.assign({}, row, tableList);
-            this.$set(this.tableList, index, currentRow);
-          } else {
-            this.tableList = res.Return.tableList;
-          }
-        }
-      }).finally(() => {
-        this.loadingShow = false;
-      });
-    },
-    gotoCluster(row) {
-      // 集群跳转
-      if (row && !this.$utils.isEmptyObj(row)) {
-        this.$router.push({ path: './ci/' + row.clusterTypeId + '/cientity-view/' + row.clusterId });
-      }
-    },
-    toCientityView(row) {
-      // 应用清单详情
-      if (row && !this.$utils.isEmptyObj(row)) {
-        window.open(HOME + '/cmdb.html#/ci/' + row.ciId + '/cientity-view/' + row.id, '_blank');
-      }
-    },
-    toCiView(ci) {
-      if (ci && !this.$utils.isEmptyObj(ci)) {
-        window.open(HOME + '/cmdb.html#/ci-view/' + ci.id, '_blank');
-      }
-    },
-    toInspectStatusDetail(row) {
-      // 巡检状态详情
-      if (row && !this.$utils.isEmptyObj(row)) {
-        // cmdb模块
-        if (this.$AuthUtils.hasRole('INSPECT_BASE')) {
-          window.open(HOME + '/cmdb.html#/inspect.html#/inspect-status-detail-' + row.id, '_blank');
-        }
-      }
-    },
-    toGlobalAttrManage() {
-      //全局属性管理
-      window.open(HOME + '/cmdb.html#/global-attr-manage', '_blank');
-    },
-    selectedEnv(name) {
-      let envId = null;
-      this.envList.forEach(v => {
-        if (v.name == name) {
-          envId = v.id;
-        }
-      });
-      this.envId = envId;
-      this.tableData.currentPage = 1;
-      this.getTableData();
-    },
-    handleTimes(time) {
-      let data = '-';
-      if (time) {
-        data = Date.parse(new Date()) - time;
-      }
-      return data;
-    }
-  },
-  computed: {},
-  watch: {
-    appSystemId() {
-      this.initData();
-    },
-    appModuleId() {
-      this.initData();
-    }
-  }
-};
-</script>
-<style lang="less" scoped>
-.assets-manage-wrap {
-  .li-box {
-    margin-bottom: -10px;
-  .li-item {
-    padding: 6px 16px;
-    border-radius: 4px;
-    text-align: center;
-    margin-bottom: 10px;
-  }
- }
-}
-
-</style>
diff --git a/src/views/pages/cmdb/newapplication/automation.vue b/src/views/pages/cmdb/newapplication/automation.vue
deleted file mode 100644
index 3a0190702..000000000
--- a/src/views/pages/cmdb/newapplication/automation.vue
+++ /dev/null
@@ -1,152 +0,0 @@
-<template>
-  <TsDialog v-bind="dialogConfig" @on-close="close" @on-ok="save">
-    <template v-slot:header>
-      <div v-if="tableData.id">{{ $t('dialog.title.edittarget',{'target':$t('page.account')}) }}</div>
-      <div v-if="!tableData.id">{{ $t('dialog.title.addtarget',{'target':$t('page.account')}) }}</div>
-    </template>
-    <template v-slot>
-      <TsForm ref="form" :item-list="formConfig"></TsForm>
-    </template>
-  </TsDialog>
-</template>
-<script>
-export default {
-  name: '',
-  components: {
-    TsForm: () => import('@/resources/plugins/TsForm/TsForm')
-  },
-  filters: {},
-  props: {
-    id: { type: Number }
-  },
-  data() {
-    let _this = this;
-    return {
-      dialogConfig: {
-        type: 'modal',
-        isShow: true
-      },
-      tableData: {},
-      formConfig: {
-        id: {
-          type: 'text',
-          name: 'id',
-          isHidden: true
-        },
-        name: {
-          type: 'text',
-          name: 'name',
-          label: this.$t('page.name'),
-          maxlength: 50,
-          validateList: [{ name: 'required', message: this.$t('form.placeholder.pleaseinput', {'target': this.$t('page.name')}), url: '/api/rest/resourcecenter/account/save', key: 'name' }, 'name-special']
-        },
-        account: {
-          type: 'text',
-          name: 'account',
-          label: this.$t('page.username'),
-          maxlength: 50,
-          validateList: [{ name: 'required', message: this.$t('form.placeholder.pleaseinput', {'target': this.$t('page.username')}) }]
-        },
-        password: {
-          type: 'password',
-          name: 'password',
-          showPassword: true,
-          label: this.$t('page.password'),
-          maxlength: 50,
-          validateList: [{ name: 'required', message: this.$t('form.placeholder.pleaseinput', {'target': this.$t('page.password')}) }]
-        },
-        protocol: {
-          type: 'select',
-          label: this.$t('term.inspect.connectionagreement'),
-          value: '',
-          multiple: false,
-          transfer: true,
-          url: 'api/rest/universal/enum/get',
-          params: { enumClass: 'neatlogic.framework.cmdb.enums.resourcecenter.Protocol' },
-          validateList: [{ name: 'required', message: this.$t('form.placeholder.pleaseselect', {'target': this.$t('term.inspect.connectionagreement')}) }],
-          onChange: function(val) {
-            if (val === 'ssh') {
-              _this.formConfig.port.isHidden = false;
-            } else {
-              _this.formConfig.port.isHidden = true;
-            }
-          }
-        },
-        port: {
-          type: 'text',
-          name: 'port',
-          label: this.$t('page.port'),
-          multiple: false,
-          value: '',
-          maxlength: 50,
-          validateList: [
-            { name: 'required', message: this.$t('form.placeholder.pleaseinput', {'target': this.$t('page.port')}) },
-            { name: 'port', message: this.$t('message.pleaseentertruetarget', {target: this.$t('page.portnumber')}) }
-          ],
-          isHidden: true
-        }
-      }
-    };
-  },
-  beforeCreate() {},
-  created() {},
-  beforeMount() {},
-  mounted() {
-    this.getAccountType();
-  },
-  beforeUpdate() {},
-  updated() {},
-  activated() {},
-  deactivated() {},
-  beforeDestroy() {},
-  destroyed() {},
-  methods: {
-    save() {
-      const form = this.$refs['form'];
-      let data = this.$refs.form.getFormValue();
-      if (!form.valid()) {
-        return;
-      }
-      this.$api.cmdb.accountmanage
-        .saveAccount(data)
-        .then(res => {
-          if (res.Status == 'OK') {
-            this.$Message.success(this.$t('message.savesuccess'));
-            this.close(true);
-          }
-        })
-        .catch(error => {
-          if (error.data.Message) {
-            this.$Message.error(error.data.Message);
-          } else {
-            this.$Message.error(this.$t('message.savefailed'));
-          }
-        });
-    },
-    close: function(needRefresh) {
-      this.$emit('close', needRefresh);
-    },
-    getAccountType() {
-      // this.formConfig.password.showPassword = false;
-      if (this.id) {
-        this.$api.accountmanage.getAccountById(this.id).then(res => {
-          this.tableData = res.Return;
-          for (let key in this.formConfig) {
-            this.$set(this.formConfig[key], 'value', this.tableData[key]);
-          }
-          // this.formConfig.forEach(element => {
-          //   this.$set(element, 'value', this.tableData[element.name]);
-          // });
-        });
-      } else {
-        this.tableData = {};
-        for (let key in this.formConfig) {
-          this.$set(this.formConfig[key], 'value', this.tableData[key]);
-        }
-      }
-    }
-  },
-  computed: {},
-  watch: {}
-};
-</script>
diff --git a/src/views/pages/cmdb/newapplication/inspect-status-detail.vue b/src/views/pages/cmdb/newapplication/inspect-status-detail.vue
deleted file mode 100644
index 86d48f6de..000000000
--- a/src/views/pages/cmdb/newapplication/inspect-status-detail.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-<template>
-  <div>
-    <AssetsInspectDetail></AssetsInspectDetail>
-  </div>
-</template>
-<script>
-import AssetsInspectDetail from '@/views/pages/inspect/assetsInspect/assets-detail';
-export default {
-  name: '',
-  components: {
-    AssetsInspectDetail
-  },
-  props: {},
-  data() {
-    return {};
-  },
-  beforeCreate() {},
-  created() {},
-  beforeMount() {},
-  mounted() {},
-  beforeUpdate() {},
-  updated() {},
-  activated() {},
-  deactivated() {},
-  beforeDestroy() {},
-  destroyed() {},
-  methods: {},
-  filter: {},
-  computed: {},
-  watch: {}
-};
-</script>
-<style lang="less">
-</style>
diff --git a/src/views/pages/cmdb/router.js b/src/views/pages/cmdb/router.js
index c14905af0..780efcae8 100644
--- a/src/views/pages/cmdb/router.js
+++ b/src/views/pages/cmdb/router.js
@@ -21,7 +21,6 @@ const customViewManage = () => import('./customview/customview-manage.vue');
 const assetManage = () => import('./asset/asset-manage.vue');
 const accountManage = () => import('./account/account-manage.vue');
 const applicationManage = () => import('./application/application-manage.vue');
-const newApplicationManage = () => import('./newapplication/application-manage.vue'); //新的应用清单
 const tagManage = () => import('./Tag/tag-manage.vue');
 const syncCiCollectionManage = () => import('./sync/sync-manage.vue');
 //const syncWizard = () => import('./sync/sync-wizard.vue');
@@ -145,18 +144,6 @@ let routerArr = [
       authority: ['AUTOEXEC_BASE', 'DEPLOY_BASE', 'INSPECT_BASE', 'DR_BASE'] //只有cmdb模块权限不显示
     }
   },
-  {
-    path: '/new-application-manage',
-    name: 'new-application-manage',
-    component: newApplicationManage,
-    meta: {
-      type: 'resourceCenter',
-      title: '新的应用清单',
-      ismenu: true,
-      icon: 'tsfont-app',
-      authority: ['AUTOEXEC_BASE', 'DEPLOY_BASE', 'INSPECT_BASE', 'DR_BASE'] //只有cmdb模块权限不显示
-    }
-  }, 
   {
     path: '/asset-manage',
     name: 'asset-manage',
diff --git a/src/views/pages/inspect/application/application-manage.vue b/src/views/pages/inspect/application/application-manage.vue
index eb0fbd31e..d44fa355d 100644
--- a/src/views/pages/inspect/application/application-manage.vue
+++ b/src/views/pages/inspect/application/application-manage.vue
@@ -151,9 +151,9 @@ export default {
     AppModuleEditDialog: () => import('@/views/pages/cmdb/application/appmodule-edit-dialog.vue'),
     DeleteCiEntityDialog: () => import('@/views/pages/cmdb/cientity/cientity-delete-dialog.vue'),
     InspectionScheduleDialog: () => import('./inspection-schedule-dialog.vue'),
-    InspectionAssetsManage: () => import('@/views/pages/inspect/application/inspection-assets-manage'), // 资产清单
     AppModuleTree: () => import('@/views/pages/cmdb/application/app-module-tree'), // 应用模块树
     LatestQuestionsManage: () => import('./latest-questions-manage'), // 最新问题
+    InspectionAssetsManage: () => import('./inspection-assets-manage'), // 资产清单
     BatchSystemInspectionDialog: () => import('./batch-system-inspection-dialog'), // 批量应用巡检
     BatchModuleInspectionDialog: () => import('./batch-module-inspection-dialog') // 批量模块巡检
   },
diff --git a/src/views/pages/inspect/application/inspection-assets-manage.vue b/src/views/pages/inspect/application/inspection-assets-manage.vue
index de243cacc..718e94837 100644
--- a/src/views/pages/inspect/application/inspection-assets-manage.vue
+++ b/src/views/pages/inspect/application/inspection-assets-manage.vue
@@ -1,337 +1,457 @@
-<template>
-  <div class="inspection-assets-manage-wrap padding">
-    <Loading :loadingShow="loadingShow" type="fix"></Loading>
-    <div v-if="envList && envList.length > 0" class="pb-sm li-box">
-      <Row :gutter="16">
-        <Col
-          v-for="item in envList"
-          :key="item.id"
-          :xs="12"
-          :sm="8"
-          :md="6"
-          :lg="4"
-          :xl="3"
-          :xxl="2"
-        >
-          <div
-            v-if="item.name"
-            class="li-item text-action"
-            :class="envId == item.id ? 'li-active li-text border-primary' : 'border-base bg-op'"
-            @click="selectedEnv(item.name)"
-          >{{ item.name }}</div>
-        </Col>
-      </Row>
-    </div>
-    <div v-if="tableList && tableList.length > 0 ">
-      <div v-for="(item, index) in tableList" :key="index">
-        <div class="h3 padding-sm">{{ item.type.label }}</div>
-        <TsTable
-          :theadList="theadList"
-          v-bind="filterTypeFields(item)"
-          @changeCurrent="(currentPage) => changeCurrent(currentPage, item, index)"
-          @changePageSize="(pageSize) => changePageSize(pageSize,item, index)"
-        >
-          <template v-slot:ip="{ row }">
-            <span class="text-href" @click="gotoDetails(row)">
-              <span>{{ row.ip }}</span>
-              <span v-if="row.port">:{{ row.port }}</span>
-            </span>
-          </template>
-          <template v-slot:monitorStatus="{ row }">
-            <!-- 监控状态 -->
-            <span v-if="row.monitorStatusJson && row.monitorTime" :title="row.monitorTime | formatDate">
-              <span :class="[row.monitorStatusJson.cssClass, {'background-FATAL': row.monitorStatusJson.value== 'FATAL'}]" class="vertical cursor">{{ row.monitorStatusJson.text }} </span>
-              <span class="text-title">
-                {{ handleTimes(row.monitorTime) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
-              </span>
-            </span>
-            <span v-else>
-              <span>-</span>
-            </span>
-          </template>
-          <template v-slot:inspectStatus="{ row }">
-            <!-- 巡检状态 -->
-            <span v-if="row.inspectStatusJson && row.inspectTime" :title="row.inspectTime | formatDate">
-              <span :class="[row.inspectStatusJson.cssClass, {'background-FATAL': row.inspectStatusJson.value== 'FATAL'}]" class="vertical cursor" @click="toInspectStatusDetail(row)">{{ row.inspectStatusJson.text }} </span>
-              <span class="text-title">
-                {{ handleTimes(row.inspectTime) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
-              </span>
-            </span>
-            <span v-else>-</span>
-          </template>
-          <template v-slot:bgList="{ row }">
-            <GroupList :dataList="row.bgList" type="tag" textName="bgName"></GroupList>
-          </template>
-          <template v-slot:ownerList="{ row }">
-            <GroupList :dataList="row.ownerList" type="tag" textName="userName"></GroupList>
-          </template>
-          <template v-slot:clusterName="{row}">
-            <!-- 所在集群 -->
-            <span v-if="row" class="text-href" @click="gotoCluster(row)">{{ row.clusterName }}</span>
-          </template>
-          <template v-slot:action="{row}">
-            <div class="tstable-action">
-              <ul class="tstable-action-ul">
-                <li class="tsfont-history" @click="toJobDetail(row)">{{ $t('term.inspect.jobdetail') }}</li>
-                <li v-auth="'INSPECT_EXECUTE'" class="tsfont-inspection" @click="doInspection(row)">{{ $t('term.inspect.inspect') }}</li>
-                <li class="tsfont-setting" @click="openRuleThresholdDialog(row)">{{ $t('term.inspect.thresholdrule') }}</li>
-              </ul>
-            </div>
-          </template>
-        </TsTable>
-      </div>
-    </div>
-    <NoData v-else></NoData>
-    <InspectionDialog
-      v-if="isShowInspectionDialog"
-      :ciEntityData="currentCiEntity"
-      @close="closeInspectionDialog"
-    ></InspectionDialog>
-    <RuleOfThresholdDialog
-      v-if="isShowRuleThresholdDialog"
-      :appSystemId="appSystemId"
-      :resourceId="resourceId"
-      @close="closeRuleOfThresholdDialog"
-    ></RuleOfThresholdDialog>
-  </div>
-</template>
-<script>
-export default {
-  name: '',
-  components: {
-    GroupList: () => import('@/resources/components/GroupList/GroupList.vue'),
-    TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
-    InspectionDialog: () => import('../assetsInspect/inspection-dialog.vue'), // 单个巡检
-    RuleOfThresholdDialog: () => import('@/views/pages/inspect/application/threshold/rule-of-threshold-dialog.vue')
-  },
-  filters: {},
-  props: {
-    appSystemId: {
-      type: Number,
-      default: null
-    },
-    appModuleId: {
-      type: Number,
-      default: null
-    },
-    moduleName: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      loadingShow: false,
-      isShowInspectionDialog: false,
-      isShowRuleThresholdDialog: false,
-      envId: '',
-      resourceId: null,
-      currentCiEntity: null,
-      envList: [],
-      tableList: [],
-      tableData: {
-        tbodyList: [],
-        rowNum: 0,
-        pageSize: 20,
-        currentPage: 1
-      },
-      theadList: [
-        { key: 'ip', title: this.$t('page.ipaddress')},
-        { key: 'name', title: this.$t('page.name')},
-        { key: 'monitorStatus', title: this.$t('term.inspect.monitoringstate')},
-        { key: 'inspectStatus', title: this.$t('term.autoexec.inspectstatus')},
-        { key: 'stateName', title: this.$t('term.autoexec.assetstatus')},
-        { key: 'envName', title: this.$t('term.inspect.envname')},
-        { key: 'clusterName', title: this.$t('term.inspect.clustername')},
-        { key: 'dataCenterName', title: this.$t('term.inspect.datacenter')},
-        { key: 'networkArea', title: this.$t('page.networkarea')},
-        { key: 'ownerList', title: this.$t('page.owner')},
-        { key: 'bgList', title: this.$t('term.autoexec.subordinatedepartment')},
-        { key: 'maintenanceWindow', title: this.$t('term.deploy.maintenancewindow')},
-        { key: 'action'}
-      ]
-    };
-  },
-  beforeCreate() {},
-  async created() {
-    await this.initData();
-  },
-  beforeMount() {},
-  mounted() {},
-  beforeUpdate() {},
-  updated() {},
-  activated() {},
-  deactivated() {},
-  beforeDestroy() {},
-  destroyed() {},
-  methods: {
-    toJobDetail(row) {
-      // 打开新的作业详情
-      if (row && row.jobPhaseNodeVo) {
-        this.$router.push({path: '/job-detail?id=' + row.jobPhaseNodeVo.jobId + '&status=' + row.jobPhaseNodeVo.status});
-      }
-    },
-    doInspection(row) {
-      // 巡检
-      this.isShowInspectionDialog = true;
-      if (row) {
-        this.currentCiEntity = row;
-      }
-    },
-    closeInspectionDialog() {
-      this.isShowInspectionDialog = false;
-      this.currentCiEntity = null;
-    },
-    restoreHistory(historyData) {
-      this.envId = historyData['envId'];
-    },
-    filterTypeFields(row) {
-      // 过滤类型字段，修复控制台报错问题
-      let currentRow = this.$utils.deepClone(row);
-      if (currentRow && currentRow.hasOwnProperty('type')) {
-        delete currentRow.type;
-      }
-      return currentRow;
-    },
-    changeCurrent(currentPage, item, index) {
-      this.tableData.currentPage = currentPage;
-      this.getTableData(item, index);
-    },
-    changePageSize(pageSize, item, index) {
-      this.tableData.pageSize = pageSize;
-      this.getTableData(item, index);
-    },
-    async initData() {
-      await this.getEnvList();
-      await this.getTableData();
-    },
-    async getEnvList() {
-      this.loadingShow = true;
-      await this.$api.cmdb.applicationManage.getEnvironmenteList().then(res => {
-        if (res.Status == 'OK') {
-          this.envList = res.Return?.tbodyList || [];
-          this.envList.unshift({
-            name: this.$t('term.inspect.allenv'),
-            id: ''
-          });
-          this.envList.push({
-            name: this.$t('term.inspect.noconfigenv'),
-            id: -2
-          });
-          this.envId = this.envId || '';
-        }
-      }).finally(() => {
-        this.loadingShow = false;
-      });
-    },
-    getTableData(row, index) {
-      let currentRow = {};
-      let params = {
-        appSystemId: this.appSystemId,
-        appModuleId: this.appModuleId,
-        envId: this.envId,
-        typeId: row && row.type ? row.type.id : null,
-        currentPage: this.tableData.currentPage,
-        pageSize: this.tableData.pageSize
-      };
-      this.$addHistoryData('envId', this.envId);
-      if (this.$utils.isEmpty(this.appSystemId) && this.$utils.isEmpty(this.appModuleId)) {
-        this.tableList = [];
-        return false;
-      }
-      this.loadingShow = true;
-      this.$api.inspect.applicationInspect.getapplicationInspectList(params).then(res => {
-        if (res.Status == 'OK') {
-          if (row && !this.$utils.isEmptyObj(row)) {
-            // 内嵌列表翻页
-            let tableList = (res.Return && res.Return.tableList) ? res.Return.tableList[0] : [];
-            currentRow = Object.assign({}, row, tableList);
-            this.$set(this.tableList, index, currentRow);
-          } else {
-            this.tableList = res.Return.tableList;
-          }
-        }
-      }).finally(() => {
-        this.loadingShow = false;
-      });
-    },
-    gotoCluster(row) {
-      // 集群跳转
-      if (row && !this.$utils.isEmptyObj(row)) {
-        this.$router.push({ path: './ci/' + row.clusterTypeId + '/cientity-view/' + row.clusterId });
-      }
-    },
-    toCientityView(row) {
-      // 应用清单详情
-      if (row && !this.$utils.isEmptyObj(row)) {
-        this.$router.push({ path: './ci/' + row.typeId + '/cientity-view/' + row.id });
-      }
-    },
-    toInspectStatusDetail(row) {
-      // 巡检状态详情
-      if (row && !this.$utils.isEmptyObj(row)) {
-        if (this.moduleName == 'inspect') {
-          // inspect模块
-          this.$router.push({ path: './assets-detail-' + row.id});
-        } else {
-          // cmdb模块
-          this.$router.push({ path: './inspect-status-detail-' + row.id});
-        }
-      }
-    },
-    gotoDetails(row) {
-      this.$router.push({ path: './assets-detail-' + row.id });
-    },
-    selectedEnv(name) {
-      let envId = null;
-      this.envList.forEach(v => {
-        if (v.name == name) {
-          envId = v.id;
-        }
-      });
-      this.envId = envId;
-      this.getTableData();
-    },
-    handleTimes(time) {
-      let data = '-';
-      if (time) {
-        data = Date.parse(new Date()) - time;
-      }
-      return data;
-    },
-    openRuleThresholdDialog(row) {
-      console.log(row);
-      if (row && row.id) {
-        this.resourceId = row.id;
-        this.isShowRuleThresholdDialog = true;
-      }
-    },
-    closeRuleOfThresholdDialog() {
-      this.isShowRuleThresholdDialog = false;
-    }
-  },
-  computed: {},
-  watch: {
-    appSystemId() {
-      this.initData();
-    },
-    appModuleId() {
-      this.initData();
-    }
-  }
-};
-</script>
-<style lang="less" scoped>
-.inspection-assets-manage-wrap {
-  .li-box {
-    margin-bottom: -10px;
-  .li-item {
-    padding: 6px 16px;
-    border-radius: 4px;
-    text-align: center;
-    margin-bottom: 10px;
-  }
- }
-}
-
-</style>
+<template>
+  <div class="inspection-assets-manage-wrap padding">
+    <Loading :loadingShow="loadingShow" type="fix"></Loading>
+    <div v-if="envList && envList.length > 0" class="pb-sm li-box">
+      <Row :gutter="16">
+        <Col
+          v-for="item in envList"
+          :key="item.id"
+          :xs="12"
+          :sm="8"
+          :md="6"
+          :lg="4"
+          :xl="3"
+          :xxl="2"
+        >
+          <div
+            v-if="item.name"
+            class="li-item text-action"
+            :class="envId == item.id ? 'li-active li-text border-primary' : 'border-base bg-op'"
+            @click="selectedEnv(item.name)"
+          >{{ item.name }}</div>
+        </Col>
+      </Row>
+    </div>
+    <div v-if="tableList && tableList.length > 0 ">
+      <div v-for="(item, index) in tableList" :key="index">
+        <div class="h3 padding-sm">{{ item.viewLabel }}</div>
+        <TsTable
+          v-bind="filterTypeFields(item)"
+          @changeCurrent="(currentPage) => changeCurrent(currentPage, item, index)"
+          @changePageSize="(pageSize) => changePageSize(pageSize,item, index)"
+        >
+          <template v-slot:ip="{ row }">
+            <span class="text-href" @click.stop="gotoDetails(row)">
+              <span>{{ row.ip.ip }}</span>
+              <span v-if="row.ip.port">:{{ row.ip.port }}</span>
+            </span>
+          </template>
+          <template v-slot:allIpList="{ row }">
+            <div v-if="!$utils.isEmpty(row.allIpList)">
+              <Tag
+                v-for="(v, vindex) in row.allIpList"
+                :key="vindex"
+                class="cursor-pointer"
+                @click.native="toCientityView(v)"
+              >
+                {{ v.name }}
+              </Tag>
+            </div>
+            <div v-else></div>
+          </template>
+          <template v-slot:lcu="{row}">
+            <UserCard v-bind="row.lcu" :hideAvatar="true"></UserCard>
+          </template>
+          <template v-slot:lcd="{ row }">
+            <div v-if="row.lcd">{{ row.lcd | formatDate }}</div>
+          </template>
+          <template v-slot:fcu="{ row }">
+            <UserCard v-bind="row.fcu" :hideAvatar="true"></UserCard>
+          </template>
+          <template v-slot:fcd="{ row }">
+            <div v-if="row.fcd">{{ row.fcd | formatDate }}</div>
+          </template>
+          <template v-slot:monitor="{ row }">
+            <!-- 监控状态 -->
+            <span v-if="row.monitor && row.monitor.time" :title="row.monitor.time | formatDate">
+              <span :class="[row.monitor.cssClass, {'background-FATAL': row.monitor.value== 'FATAL'}]" class="vertical">{{ row.monitor.text }} </span>
+              <span class="text-title">
+                {{ handleTimes(row.monitor.time) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
+              </span>
+            </span>
+            <span v-else></span>
+          </template>
+          <template v-slot:inspect="{ row }">
+            <!-- 巡检状态 -->
+            <span v-if="row.inspect && row.inspect.time" :title="row.inspect.time | formatDate">
+              <span :class="[row.inspect.cssClass, {'background-FATAL': row.inspect.value== 'FATAL'}]" class="vertical cursor" @click="toInspectStatusDetail(row)">{{ row.inspect.text }} </span>
+              <span class="text-title">
+                {{ handleTimes(row.inspect.time) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
+              </span>
+            </span>
+            <span v-else>
+              <span>-</span>
+            </span>
+          </template>
+          <template v-slot:taskStatus="{ row }">
+            <CommonStatus
+              v-if="row.taskStatus"
+              :statusName="row.taskStatus.text"
+              :statusValue="row.taskStatus.value"
+              type="text"
+            ></CommonStatus>
+            <span v-else>-</span>
+          </template>
+          <template v-slot:vendor="{ row }">
+            <Tag
+              v-if="!$utils.isEmpty(row.vendor)"
+              class="cursor-pointer"
+              @click.native="toCientityView(row.vendor)"
+            >
+              {{ row.vendor.name }}
+            </Tag>
+            <span v-else></span>
+          </template>
+          <template v-slot:appModule="{ row }">
+            <div v-if="!$utils.isEmpty(row.appModule)" class="text-href" @click="toCientityView(row.appModule)">
+              <span :class="row.appModule.ciIcon"></span>
+              <span>{{ row.appModule.name }}</span>
+            </div>
+          </template>
+          <template v-slot:appEnvironment="{ row }">
+            <Tag
+              v-if="!$utils.isEmpty(row.appEnvironment)"
+              class="cursor-pointer"
+              @click.native="toGlobalAttrManage()"
+            >
+              {{ row.appEnvironment.value }}
+            </Tag>
+          </template>
+          <template v-slot:appSystem="{row}">
+            <!-- 应用系统 -->
+            <div v-if="!$utils.isEmpty(row.appSystem)" class="text-href" @click="toCientityView(row.appSystem)">
+              <span :class="row.appSystem.ciIcon"></span>
+              <span>{{ row.appSystem.name }}</span>
+            </div>
+          </template>
+          <template v-slot:ownerList="{ row }">
+            <div v-if="!$utils.isEmpty(row.ownerList)">
+              <Tag
+                v-for="(o, oindex) in row.ownerList"
+                :key="oindex"
+                class="cursor-pointer"
+                @click.native="toCientityView(o);"
+              >
+                {{ o.name }}
+              </Tag>
+            </div>
+            <div v-else></div>
+          </template>
+          <template v-slot:businessGroupList="{ row }">
+            <div v-if="!$utils.isEmpty(row.businessGroupList)">
+              <Tag
+                v-for="(b, bindex) in row.businessGroupList"
+                :key="bindex"
+                class="cursor-pointer"
+                @click.native="toCientityView(b)"
+              >
+                {{ b.name }}
+              </Tag>
+            </div>
+            <div v-else></div>
+          </template>
+          <template v-slot:state="{row}">
+            <!-- 资产状态 -->
+            <Tag
+              v-if="!$utils.isEmpty(row.state)"
+              class="cursor-pointer"
+              @click.native="toCientityView(row.state)"
+            >
+              {{ row.state.name }}
+            </Tag>
+          </template>
+          <template v-slot:dataCenter="{ row }">
+            <!-- 数据中心 -->
+            <Tag
+              v-if="!$utils.isEmpty(row.dataCenter)"
+              class="cursor-pointer"
+              @click.native="toCientityView(row.dataCenter)"
+            >
+              {{ row.dataCenter.name }}
+            </Tag>
+            <span v-else></span>
+          </template>
+          <template v-slot:ci="{row}">
+            <!-- 模型 -->
+            <div v-if="!$utils.isEmpty(row.ci)" class="text-href" @click="toCiView(row.ci)">
+              <span :class="row.ci.icon"></span>
+              <span>{{ row.ci.label }}</span>
+            </div>
+          </template>
+          <template v-slot:action="{row}">
+            <div class="tstable-action">
+              <ul class="tstable-action-ul">
+                <li v-if="row && row.jobPhaseNodeVo && row.jobPhaseNodeVo.jobId" class="tsfont-history" @click="toJobDetail(row)">{{ $t('term.inspect.jobdetail') }}</li>
+                <li v-auth="'INSPECT_EXECUTE'" class="tsfont-inspection" @click="doInspection(row)">{{ $t('term.inspect.inspect') }}</li>
+                <li class="tsfont-setting" @click="openRuleThresholdDialog(row)">{{ $t('term.inspect.thresholdrule') }}</li>
+              </ul>
+            </div>
+          </template>
+        </TsTable>
+      </div>
+    </div>
+    <NoData v-else></NoData>
+    <InspectionDialog
+      v-if="isShowInspectionDialog"
+      :ciEntityData="currentCiEntity"
+      @close="closeInspectionDialog"
+    ></InspectionDialog>
+    <RuleOfThresholdDialog
+      v-if="isShowRuleThresholdDialog"
+      :appSystemId="appSystemId"
+      :resourceId="resourceId"
+      @close="closeRuleOfThresholdDialog"
+    ></RuleOfThresholdDialog>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    UserCard: () => import('@/resources/components/UserCard/UserCard.vue'),
+    TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
+    InspectionDialog: () => import('../assetsInspect/inspection-dialog.vue'), // 单个巡检
+    RuleOfThresholdDialog: () => import('./threshold/rule-of-threshold-dialog.vue'), //阈值规则
+    CommonStatus: () => import('@/resources/components/Status/CommonStatus.vue')
+    
+  },
+  filters: {},
+  props: {
+    appSystemId: {
+      type: Number,
+      default: null
+    },
+    appModuleId: {
+      type: Number,
+      default: null
+    },
+    moduleName: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      loadingShow: false,
+      isShowInspectionDialog: false,
+      isShowRuleThresholdDialog: false,
+      envId: '',
+      resourceId: null,
+      currentCiEntity: null,
+      envList: [],
+      tableList: [],
+      tableData: {
+        tbodyList: [],
+        rowNum: 0,
+        pageSize: 20,
+        currentPage: 1
+      }
+      // theadList: [
+      //   { key: 'ip', title: this.$t('page.ipaddress')},
+      //   { key: 'name', title: this.$t('page.name')},
+      //   { key: 'monitorStatus', title: this.$t('term.inspect.monitoringstate')},
+      //   { key: 'inspectStatus', title: this.$t('term.autoexec.inspectstatus')},
+      //   { key: 'stateName', title: this.$t('term.autoexec.assetstatus')},
+      //   { key: 'envName', title: this.$t('term.inspect.envname')},
+      //   { key: 'clusterName', title: this.$t('term.inspect.clustername')},
+      //   { key: 'dataCenterName', title: this.$t('term.inspect.datacenter')},
+      //   { key: 'networkArea', title: this.$t('page.networkarea')},
+      //   { key: 'ownerList', title: this.$t('page.owner')},
+      //   { key: 'bgList', title: this.$t('term.autoexec.subordinatedepartment')},
+      //   { key: 'maintenanceWindow', title: this.$t('term.deploy.maintenancewindow')},
+      //   { key: 'action'}
+      // ]
+    };
+  },
+  beforeCreate() {},
+  async created() {
+    await this.initData();
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    toJobDetail(row) {
+      // 打开新的作业详情
+      if (row && row.jobPhaseNodeVo) {
+        window.open(HOME + '/inspect.html#/job-detail?id=' + row.jobPhaseNodeVo.jobId + '&status=' + row.jobPhaseNodeVo.status, '_blank');
+       
+        // this.$router.push({path: '/job-detail?id=' + row.jobPhaseNodeVo.jobId + '&status=' + row.jobPhaseNodeVo.status});
+      }
+    },
+    doInspection(row) {
+      // 巡检
+      this.isShowInspectionDialog = true;
+      if (row) {
+        this.currentCiEntity = row;
+      }
+    },
+    closeInspectionDialog() {
+      this.isShowInspectionDialog = false;
+      this.currentCiEntity = null;
+    },
+    restoreHistory(historyData) {
+      this.envId = historyData['envId'];
+    },
+    filterTypeFields(row) {
+      // 过滤类型字段，修复控制台报错问题
+      let currentRow = this.$utils.deepClone(row);
+      if (currentRow && currentRow.hasOwnProperty('type')) {
+        delete currentRow.type;
+      }
+      if (currentRow && currentRow.hasOwnProperty('theadList')) {
+        currentRow.theadList.push({
+          title: '',
+          key: 'action'
+        });
+      }
+      return currentRow;
+    },
+    changeCurrent(currentPage, item, index) {
+      this.tableData.currentPage = currentPage;
+      this.getTableData(item, index);
+    },
+    changePageSize(pageSize, item, index) {
+      this.tableData.pageSize = pageSize;
+      this.tableData.currentPage = 1;
+      this.getTableData(item, index);
+    },
+    async initData() {
+      this.tableData.currentPage = 1;
+      await this.getEnvList();
+      await this.getTableData();
+    },
+    async getEnvList() {
+      this.loadingShow = true;
+      await this.$api.cmdb.applicationManage.getEnvironmenteList().then(res => {
+        if (res.Status == 'OK') {
+          this.envList = res.Return?.tbodyList || [];
+          this.envList.unshift({
+            name: this.$t('term.inspect.allenv'),
+            id: ''
+          });
+          this.envList.push({
+            name: this.$t('term.inspect.noconfigenv'),
+            id: -2
+          });
+          this.envId = this.envId || '';
+        }
+      }).finally(() => {
+        this.loadingShow = false;
+      });
+    },
+    getTableData(row, index) {
+      let currentRow = {};
+      let params = {
+        appSystemId: this.appSystemId,
+        appModuleId: this.appModuleId,
+        envId: this.envId,
+        typeId: row && row.type ? row.type.id : null,
+        currentPage: this.tableData.currentPage,
+        pageSize: this.tableData.pageSize
+      };
+      this.$addHistoryData('envId', this.envId);
+      if (this.$utils.isEmpty(this.appSystemId) && this.$utils.isEmpty(this.appModuleId)) {
+        this.tableList = [];
+        return false;
+      }
+      this.loadingShow = true;
+      this.$api.inspect.applicationInspect.getNewapplicationInspectList(params).then(res => {
+        if (res.Status == 'OK') {
+          if (row && !this.$utils.isEmptyObj(row)) {
+            // 内嵌列表翻页
+            let tableList = (res.Return && res.Return.tableList) ? res.Return.tableList[0] : [];
+            currentRow = Object.assign({}, row, tableList);
+            this.$set(this.tableList, index, currentRow);
+          } else {
+            this.tableList = res.Return.tableList;
+          }
+        }
+      }).finally(() => {
+        this.loadingShow = false;
+      });
+    },
+    toCientityView(row) {
+      // 应用清单详情
+      if (row && !this.$utils.isEmptyObj(row)) {
+        window.open(HOME + '/inspect.html#/ci/' + row.ciId + '/cientity-view/' + row.id, '_blank');
+      
+        // this.$router.push({ path: './ci/' + row.typeId + '/cientity-view/' + row.id });
+      }
+    },
+    toInspectStatusDetail(row) {
+      // 巡检状态详情
+      if (row && !this.$utils.isEmptyObj(row)) {
+        window.open(HOME + '/inspect.html#/assets-detail-' + row.id, '_blank');
+      }
+    },
+    gotoDetails(row) {
+      window.open(HOME + '/inspect.html#/assets-detail-' + row.id, '_blank');
+    },
+    toGlobalAttrManage() {
+      //全局属性管理
+      window.open(HOME + '/cmdb.html#/global-attr-manage', '_blank');
+    },
+    toCiView(ci) {
+      if (ci && !this.$utils.isEmptyObj(ci)) {
+        window.open(HOME + '/cmdb.html#/ci-view/' + ci.id, '_blank');
+      }
+    },
+    selectedEnv(name) {
+      let envId = null;
+      this.envList.forEach(v => {
+        if (v.name == name) {
+          envId = v.id;
+        }
+      });
+      this.envId = envId;
+      this.tableData.currentPage = 1;
+      this.getTableData();
+    },
+    handleTimes(time) {
+      let data = '-';
+      if (time) {
+        data = Date.parse(new Date()) - time;
+      }
+      return data;
+    },
+    openRuleThresholdDialog(row) {
+      if (row && row.id) {
+        this.resourceId = row.id;
+        this.isShowRuleThresholdDialog = true;
+      }
+    },
+    closeRuleOfThresholdDialog() {
+      this.isShowRuleThresholdDialog = false;
+    }
+  },
+  computed: {},
+  watch: {
+    appSystemId() {
+      this.initData();
+    },
+    appModuleId() {
+      this.initData();
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+.inspection-assets-manage-wrap {
+  .li-box {
+    margin-bottom: -10px;
+  .li-item {
+    padding: 6px 16px;
+    border-radius: 4px;
+    text-align: center;
+    margin-bottom: 10px;
+  }
+ }
+}
+
+</style>
diff --git a/src/views/pages/inspect/application/latest-questions-manage.vue b/src/views/pages/inspect/application/latest-questions-manage.vue
index e88a1fe7f..7d9d840ad 100644
--- a/src/views/pages/inspect/application/latest-questions-manage.vue
+++ b/src/views/pages/inspect/application/latest-questions-manage.vue
@@ -1,577 +1,719 @@
-<template>
-  <div class="latest-question-manage-box padding">
-    <Loading :loadingShow="loadingShow" type="fix"></Loading>
-    <div class="action-group text-right pb-sm">
-      <span :class="isExpandCollapse ? 'tsfont-up' : 'tsfont-down'" class="action-item" @click="handleExpandCollapseAll()">
-        <span v-if="isExpandCollapse">{{ $t('page.packup') }}</span>
-        <span v-else>{{ $t('page.expand') }}</span>
-      </span>
-      <span class="action-item tsfont-rotate-right" @click="handleRefresh()">{{ $t('page.refresh') }}</span>
-      <span v-if="!downloadLoading" v-download="downloadUrl" class="action-item tsfont-download">{{ $t('page.export') }}</span>
-      <span v-if="downloadLoading" class="action-item disable" :title="$t('page.downloadloadingtip')">
-        <Icon type="ios-loading" size="18" class="loading icon-right"></Icon>
-        {{ $t('page.export') }}
-      </span>
-      <span class="action-item tsfont-mail-unread-o" @click="sendEmail">{{ $t('page.mail') }}</span>
-    </div>
-    <div v-if="envList && envList.length > 0" class="li-box">
-      <Row :gutter="16">
-        <Col
-          v-for="item in envList"
-          :key="item.id"
-          :xs="12"
-          :sm="8"
-          :md="6"
-          :lg="4"
-          :xl="3"
-          :xxl="2"
-        >
-          <div
-            v-if="item.name"
-            class="li-item text-action"
-            :class="envId == item.id ? 'li-active li-text border-primary' : 'border-base bg-op'"
-            @click="selectedEnv(item.name)"
-          >{{ item.name }}</div>
-        </Col>
-      </Row>
-    </div>
-    <div v-if="tableList && tableList.length > 0 ">
-      <div v-for="(item, tIndex) in tableList" :key="tIndex">
-        <div class="h3 padding-sm">{{ item.type.label }}</div>
-        <div>
-          <TsTable
-            v-if="!loadingShow"
-            v-bind="filterTypeFields(item)"
-            :theadList="theadList"
-            :fixedHeader="false"
-            keyName="id"
-            canExpand
-            class="inner-table"
-            @changeCurrent="(currentPage) => changeCurrent(currentPage, item, tIndex)"
-            @changePageSize="(pageSize) => changePageSize(pageSize, item, tIndex)"
-          >
-            <template v-slot:ip="{ row }">
-              <span class="text-href" @click.stop="toAssetsDetail(row)">
-                <span>{{ row.ip }}</span>
-                <span v-if="row.port">:{{ row.port }}</span>
-              </span>
-            </template>
-            <template v-slot:monitorTime="{ row }">
-              <!-- 监控状态 -->
-              <span v-if="row.monitorStatusJson && row.monitorTime" :title="row.monitorTime | formatDate">
-                <span :class="[row.monitorStatusJson.cssClass, { 'background-FATAL': row.monitorStatusJson.value == 'FATAL' }]" class="mr-xs cursor">{{ row.monitorStatusJson.text }}</span>
-                <span class="text-title">{{ handleTime(row.monitorTime) | formatTimeCost({ unitNumber: 1, language: 'zh', unit: 'minute' }) }}{{ $t('page.before') }}</span>
-              </span>
-              <span v-else>
-                <span>-</span>
-              </span>
-            </template>
-            <template v-slot:taskStatus="{ row }">
-              <CommonStatus
-                v-if="row.jobPhaseNodeVo"
-                :statusName="row.jobPhaseNodeVo.statusName"
-                :statusValue="row.jobPhaseNodeVo.status"
-                type="text"
-              ></CommonStatus>
-              <span v-else>-</span>
-            </template>
-            <template v-slot:inspectTime="{ row }">
-              <!-- 巡检状态 -->
-              <span v-if="row.inspectStatusJson && row.inspectTime" :title="row.inspectTime | formatDate">
-                <span :class="[row.inspectStatusJson.cssClass, { 'background-FATAL': row.inspectStatusJson.value == 'FATAL' }]" class="mr-xs cursor" @click.stop="toAssetsDetail(row)">{{ row.inspectStatusJson.text }}</span>
-                <span class="text-title">{{ handleTime(row.inspectTime) | formatTimeCost({ unitNumber: 1, language: 'zh', unit: 'minute' }) }}{{ $t('page.before') }}</span>
-              </span>
-              <span v-else>
-                <span>-</span>
-              </span>
-            </template>
-            <template v-slot:expandCollapseArrow="{ row ,index}">
-              <span :class="{ 'tsfont-right': !row._expand, 'tsfont-down open': row._expand }" class="table-icon" @click.stop="openInnerTable(row, tIndex, index)"></span>
-            </template>
-            <template v-slot:action="{ row }">
-              <div class="tstable-action">
-                <ul class="tstable-action-ul">
-                  <li class="tsfont-setting" @click="openRuleThresholdDialog(row)">{{ $t('term.inspect.thresholdrule') }}</li>
-                  <li v-if="row && row.jobPhaseNodeVo && row.jobPhaseNodeVo.jobId" class="tsfont-history" @click="toJobDetail(row)">{{ $t('term.inspect.jobdetail') }}</li>
-                  <li class="tsfont-ci" @click="toCientityView(row)">{{ $t('term.cmdb.viewcientity') }}</li>
-                </ul>
-              </div>
-            </template>
-            <template v-slot:expand="{ row }">
-              <ExpandTable v-if="row._expand" style="margin-left: 40px;" :inspectResultList="getInnerTbodyList(row.inspectResult)"></ExpandTable>
-            </template>
-          </TsTable>
-        </div>
-      </div>
-    </div>
-    <NoData v-else></NoData>
-    <SendEmail
-      v-if="isShowSendEmail"
-      :params="{
-        isNeedAlertDetail: 1,
-        appSystemId: appSystemId,
-        inspectStatusList: inspectStatusList
-      }"
-      @closeSendEmailDialog="closeSendEmailDialog"
-    ></SendEmail>
-    <RuleOfThresholdDialog
-      v-if="isShowRuleThresholdDialog"
-      :appSystemId="appSystemId"
-      :resourceId="resourceId"
-      @close="closeRuleOfThresholdDialog"
-    ></RuleOfThresholdDialog>
-  </div>
-</template>
-<script>
-import download from '@/resources/directives/download.js';
-export default {
-  name: '',
-  components: {
-    TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
-    CommonStatus: () => import('@/resources/components/Status/CommonStatus.vue'),
-    ExpandTable: () => import('@/views/pages/inspect/recentIssues/component/expand-table.vue'),
-    SendEmail: () => import('@/views/pages/inspect/recentIssues/component/send-email.vue'),
-    RuleOfThresholdDialog: () => import('@/views/pages/inspect/application/threshold/rule-of-threshold-dialog.vue')
-  },
-  directives: { download },
-  props: {
-    appSystemId: {
-      // 应用Id
-      type: Number,
-      default: null
-    },
-    appModuleId: {
-      // 模块Id
-      type: Number,
-      default: null
-    }
-  },
-  data() {
-    return {
-      loadingShow: true,
-      isExpandCollapse: true, // 处理展开收起，默认展开
-      isShowSendEmail: false,
-      downloadLoading: false,
-      isShowRuleThresholdDialog: false,
-      typeName: '',
-      envId: null, // 环境ID
-      envList: [], // 环境列表
-      expandCollapseIdList: [], // 展开收起Id列表，下榻页面，返回显示用
-      isBack: false,
-      tableList: [],
-      tableConfig: {
-        tbodyList: [],
-        pageSize: 20,
-        currentPage: 1,
-        rowNum: null
-      },
-      theadList: [
-        {
-          title: '',
-          key: 'expandCollapseArrow' // 展开收起箭头
-        },
-        {
-          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: this.$t('term.inspect.inspectionjobstatus'),
-          key: 'taskStatus'
-        },
-        {
-          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: '',
-          key: 'action'
-        }
-      ]
-    };
-  },
-  beforeCreate() {},
-  created() {},
-  beforeMount() {},
-  mounted() {
-    this.initData();
-  },
-  beforeUpdate() {},
-  updated() {},
-  activated() {},
-  deactivated() {},
-  beforeDestroy() {},
-  destroyed() {},
-  methods: {
-    async initData() {
-      await this.getEnvList();
-      await this.getInspectStatusList();
-      await this.getTableData();
-    },
-    async getEnvList() {
-      await this.$api.cmdb.applicationManage.getEnvironmenteList().then(res => {
-        if (res.Status == 'OK') {
-          this.envList = res.Return?.tbodyList || [];
-          this.envList.unshift({
-            name: this.$t('term.inspect.allenv'),
-            id: ''
-          });
-          this.envList.push({
-            name: this.$t('term.inspect.noconfigenv'),
-            id: -2
-          });
-          this.envId = this.envId || ''; // 有环境id，就取环境ID的值，否则默认选择所有环境（用于下榻页面返回）
-        }
-      });
-    },
-    async getInspectStatusList() {
-      // 获取巡检状态列表
-      this.inspectStatusList = [];
-      await this.$api.common.getSelectList({enumClass: 'InspectStatus'}).then((res) => {
-        if (res.Status == 'OK') {
-          let nodeList = res.Return || [];
-          if (nodeList && nodeList.length > 0) {
-            nodeList.forEach(item => {
-              if (item && item.value != 'normal') {
-                this.inspectStatusList.push(item.value);
-              }
-            });
-          }
-        }
-      });
-    },
-    getTableData(row, index) {
-      //获取表格数据
-      let params = {
-        appSystemId: this.appSystemId,
-        appModuleId: this.appModuleId,
-        envId: this.envId,
-        inspectStatusList: this.inspectStatusList,
-        currentPage: this.tableConfig.currentPage,
-        pageSize: this.tableConfig.pageSize
-      };
-      this.$addHistoryData('isExpandCollapse', this.isExpandCollapse);
-      this.$addHistoryData('expandCollapseIdList', this.expandCollapseIdList);
-      this.$addHistoryData('envId', this.envId);
-      this.loadingShow = true;
-      this.$api.inspect.applicationInspect.getapplicationInspectList(params).then(res => {
-        if (res.Status == 'OK') {
-          if (row && !this.$utils.isEmptyObj(row)) {
-            // 内嵌列表翻页
-            let tableList = (res.Return && res.Return.tableList) ? ((res.Return.tableList.length > index) ? res.Return.tableList[index] : res.Return.tableList[0]) : [];
-            let currentRow = Object.assign({}, row, tableList);
-            this.tableConfig.pageSize = tableList ? tableList.pageSize : 20;
-            this.tableConfig.currentPage = tableList ? tableList.currentPage : 1;
-            this.$set(this.tableList, index, currentRow);
-          } else {
-            this.tableList = res.Return ? res.Return.tableList : [];
-            this.tableConfig.pageSize = 20;
-            this.tableConfig.currentPage = 1;
-          }
-          let resourceIdList = [];
-          if (this.tableList && !this.$utils.isEmpty(this.tableList)) {
-            this.tableList.forEach(item => {
-              if (item && item.tbodyList && !this.$utils.isEmpty(item.tbodyList)) {
-                item.tbodyList.forEach((v) => {
-                  if (v && v.id) {
-                    resourceIdList.push(v.id);
-                  }
-                });
-              }
-            });
-          }
-          if (this.$utils.isEmpty(this.expandCollapseIdList) && this.isExpandCollapse) {
-            // 首次需要把id存起来，下榻页面返回需要使用
-            this.expandCollapseIdList = resourceIdList;
-            this.$addHistoryData('expandCollapseIdList', this.expandCollapseIdList);
-          }
-          this.getInnerTableList(resourceIdList); // 获取内嵌表格数据
-        }
-      }).catch(() => {
-        this.loadingShow = false;
-      });
-    },
-    getInnerTableList(resourceIdList) {
-      // 获取内嵌表格数据
-      this.loadingShow = true;
-      if (resourceIdList && !this.$utils.isEmpty(resourceIdList)) {
-        this.$api.inspect.inspectJob.getRecentIssuesInnerTableList({ resourceIdList: resourceIdList }).then(res => {
-          if (res.Status == 'OK') {
-            let obj = res.Return;
-            this.tableList.forEach(item => {
-              if (item && item.tbodyList && !this.$utils.isEmpty(item.tbodyList)) {
-                item.tbodyList.forEach((v) => {
-                  Object.keys(obj).forEach(n => {
-                    if (v.id == n) {
-                      this.$set(v, 'inspectResult', obj[n] ? Object.values(obj[n]) : []);
-                    }
-                  });
-                });
-              }
-            });
-            if (this.tableList && !this.$utils.isEmpty(this.tableList)) {
-              this.tableList.forEach(val => {
-                if (val && val.tbodyList && !this.$utils.isEmpty(val.tbodyList)) {
-                  val.tbodyList.forEach((v) => {
-                    if (v && v.hasOwnProperty('inspectResult') && !this.$utils.isEmpty(v.inspectResult)) {
-                      if (this.isBack) { // 下榻页面返回，恢复之前展开收起状态
-                        v['_expand'] = !this.$utils.isEmpty(this.expandCollapseIdList) ? this.expandCollapseIdList.includes(v.id) : this.isExpandCollapse;
-                      } else {
-                        v['_expand'] = this.isExpandCollapse;
-                      }
-                    }
-                  });
-                }
-              });
-            }
-          }
-        }).finally(() => {
-          this.loadingShow = false;
-        });
-      } else {
-        this.loadingShow = false;
-      }
-    },
-    changeCurrent(currentPage, item, index) {
-      this.tableConfig.currentPage = currentPage;
-      this.getTableData(item, index);
-    },
-    changePageSize(pageSize, item, index) {
-      this.tableConfig.pageSize = pageSize;
-      this.getTableData(item, index);
-    },
-    restoreHistory(historyData) {
-      // 下榻页面，返回搜索条件保持一致
-      this.isBack = true;
-      this.envId = historyData['envId'];
-      this.expandCollapseIdList = historyData['expandCollapseIdList'];
-      this.isExpandCollapse = historyData['isExpandCollapse'];
-    },
-    selectedEnv(name) {
-      let envId = null;
-      this.envList.forEach(v => {
-        if (v.name == name) {
-          envId = v.id;
-        }
-      });
-      this.envId = envId;
-      this.getTableData();
-    },
-    filterTypeFields(row) {
-      // 过滤类型字段，修复控制台报错问题
-      let currentRow = this.$utils.deepClone(row);
-      if (currentRow && currentRow.hasOwnProperty('type')) {
-        delete currentRow.type;
-      }
-      return currentRow;
-    },
-    handleTime(time) {
-      let data = '-';
-      if (time) {
-        data = Date.parse(new Date()) - time;
-      }
-      return data;
-    },
-    handleExpandCollapseAll() {
-      // 处理展开收起所有(内嵌表格)
-      this.isExpandCollapse = !this.isExpandCollapse;
-      let expandCollapseIdList = [];
-      if (this.tableList && !this.$utils.isEmpty(this.tableList)) {
-        this.tableList.forEach(item => {
-          if (item && item.tbodyList && !this.$utils.isEmpty(item.tbodyList)) {
-            item.tbodyList.forEach((v) => {
-              v['_expand'] = this.isExpandCollapse;
-              if (this.isExpandCollapse) {
-                // 展开，需要存储展开的id
-                expandCollapseIdList.push(v.id);
-              } else {
-                expandCollapseIdList = [];
-              }
-            });
-          }
-        });
-      }
-      this.expandCollapseIdList = expandCollapseIdList;
-      this.$addHistoryData('isExpandCollapse', this.isExpandCollapse);
-      this.$addHistoryData('expandCollapseIdList', expandCollapseIdList);
-    },
-    openInnerTable(row, tIndex, rowIndex) {
-      // 展开收起内嵌表格
-      if (row['_expand']) {
-        row._expand = false;
-        this.$set(this.tableList[tIndex]['tbodyList'], rowIndex, row);
-        this.isExpandCollapse = false;
-        this.expandCollapseIdList && this.expandCollapseIdList.forEach((id, index) => {
-          if (id == row.id) {
-            this.expandCollapseIdList.splice(index, 1);
-          }
-        });
-      } else {
-        row._expand = true;
-        this.$set(this.tableList[tIndex]['tbodyList'], rowIndex, row);
-        this.isExpandCollapse = true;
-        if (!this.expandCollapseIdList.includes(row.id)) {
-          // id没有时，才push进去
-          this.expandCollapseIdList.push(row.id);
-        }
-      }
-      this.$addHistoryData('expandCollapseIdList', this.expandCollapseIdList);
-      this.$addHistoryData('isExpandCollapse', this.isExpandCollapse);
-    },
-    getInnerTbodyList(inspectResult) {
-      // 处理内嵌表格数据
-      let tbodyList = [];
-      if (inspectResult && !this.$utils.isEmpty(inspectResult)) {
-        tbodyList = inspectResult;
-      }
-      return tbodyList;
-    },
-    handleRefresh() {
-      // 处理刷新
-      this.tableConfig.currentPage = 1;
-      this.getTableData();
-    },
-    sendEmail() {
-      // 发送邮件
-      this.isShowSendEmail = true;
-    },
-    closeSendEmailDialog() {
-      this.isShowSendEmail = false;
-    },
-    toAssetsDetail(row) {
-      // 跳转巡检报告页面
-      this.$router.push({
-        path: './assets-detail-' + row.id
-      });
-    },
-    toJobDetail(row) {
-      // 工作详情
-      this.$router.push({path: '/job-detail?id=' + row.jobPhaseNodeVo.jobId + '&status=' + row.jobPhaseNodeVo.status});
-    },
-    toCientityView(row) {
-      // 跳转查看配置项页面
-      this.$router.push({path: '/ci/' + row.typeId + '/cientity-view/' + row.id});
-    },
-    openRuleThresholdDialog(row) {
-      if (row && row.id) {
-        this.resourceId = row.id;
-        this.isShowRuleThresholdDialog = true;
-      }
-    },
-    closeRuleOfThresholdDialog() {
-      this.isShowRuleThresholdDialog = false;
-    }
-  },
-  filter: {},
-  computed: {
-    downloadUrl() {
-      return {
-        url: 'api/binary/inspect/new/problem/report/export',
-        method: 'post',
-        params: {
-          isNeedAlertDetail: 1,
-          appSystemId: this.appSystemId,
-          inspectStatusList: this.inspectStatusList
-        },
-        changeStatus: status => {
-          if (status == 'start') {
-            this.downloadLoading = true;
-          } else if (status == 'success' || status == 'error') {
-            this.downloadLoading = false;
-          }
-        }
-      };
-    }
-  },
-  watch: {
-    appModuleId(id) {
-      if (id) {
-        this.expandCollapseIdList = [];
-        this.isExpandCollapse = true;
-        this.isBack = false;
-        this.initData();
-      }
-    },
-    appSystemId(id) {
-      if (id && this.$utils.isEmpty(this.appModuleId)) {
-        this.expandCollapseIdList = [];
-        this.isExpandCollapse = true;
-        this.isBack = false;
-        this.initData();
-      }
-    }
-  }
-};
-</script>
-<style lang="less" scoped>
-.latest-question-manage-box {
-  .li-box {
-    margin-bottom: -10px;
-  .li-item {
-    padding: 6px 16px;
-    border-radius: 4px;
-    text-align: center;
-    margin-bottom: 10px;
-  }
- }
- .table-icon {
-  cursor: pointer;
-  font-size: 14px;
-  visibility: hidden;
-  padding: 1px 3px;
-  &.open {
-    visibility: visible;
-  }
-}
-tr:hover {
-  .table-icon {
-    visibility: visible;
-  }
- }
-}
-</style>
+<template>
+  <div class="latest-question-manage-box padding">
+    <Loading :loadingShow="loadingShow" type="fix"></Loading>
+    <div class="action-group text-right pb-sm">
+      <span :class="isExpandCollapse ? 'tsfont-up' : 'tsfont-down'" class="action-item" @click="handleExpandCollapseAll()">
+        <span v-if="isExpandCollapse">{{ $t('page.packup') }}</span>
+        <span v-else>{{ $t('page.expand') }}</span>
+      </span>
+      <span class="action-item tsfont-rotate-right" @click="handleRefresh()">{{ $t('page.refresh') }}</span>
+      <span v-if="!downloadLoading" v-download="downloadUrl" class="action-item tsfont-download">{{ $t('page.export') }}</span>
+      <span v-if="downloadLoading" class="action-item disable" :title="$t('page.downloadloadingtip')">
+        <Icon type="ios-loading" size="18" class="loading icon-right"></Icon>
+        {{ $t('page.export') }}
+      </span>
+      <span class="action-item tsfont-mail-unread-o" @click="sendEmail">{{ $t('page.mail') }}</span>
+    </div>
+    <div v-if="envList && envList.length > 0" class="li-box">
+      <Row :gutter="16">
+        <Col
+          v-for="item in envList"
+          :key="item.id"
+          :xs="12"
+          :sm="8"
+          :md="6"
+          :lg="4"
+          :xl="3"
+          :xxl="2"
+        >
+          <div
+            v-if="item.name"
+            class="li-item text-action"
+            :class="envId == item.id ? 'li-active li-text border-primary' : 'border-base bg-op'"
+            @click="selectedEnv(item.name)"
+          >{{ item.name }}</div>
+        </Col>
+      </Row>
+    </div>
+    <div v-if="tableList && tableList.length > 0 ">
+      <div v-for="(item, tIndex) in tableList" :key="tIndex">
+        <div class="h3 padding-sm">{{ item.viewLabel }}</div>
+        <div>
+          <TsTable
+            v-if="!loadingShow"
+            v-bind="filterTypeFields(item)"
+            :fixedHeader="false"
+            keyName="id"
+            canExpand
+            class="inner-table"
+            @changeCurrent="(currentPage) => changeCurrent(currentPage, item, tIndex)"
+            @changePageSize="(pageSize) => changePageSize(pageSize, item, tIndex)"
+          >
+            <template v-slot:ip="{ row }">
+              <span class="text-href" @click.stop="toAssetsDetail(row)">
+                <span>{{ row.ip.ip }}</span>
+                <span v-if="row.ip.port">:{{ row.ip.port }}</span>
+              </span>
+            </template>
+            <template v-slot:allIpList="{ row }">
+              <div v-if="!$utils.isEmpty(row.allIpList)">
+                <Tag
+                  v-for="(v, vindex) in row.allIpList"
+                  :key="vindex"
+                  class="cursor-pointer"
+                  @click.native="toCientityView(v)"
+                >
+                  {{ v.name }}
+                </Tag>
+              </div>
+              <div v-else></div>
+            </template>
+            <template v-slot:monitor="{ row }">
+              <!-- 监控状态 -->
+              <span v-if="row.monitor && row.monitor.time" :title="row.monitor.time | formatDate">
+                <span :class="[row.monitor.cssClass, {'background-FATAL': row.monitor.value== 'FATAL'}]" class="vertical">{{ row.monitor.text }} </span>
+                <span class="text-title">
+                  {{ handleTime(row.monitor.time) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
+                </span>
+              </span>
+              <span v-else>
+                <span>-</span>
+              </span>
+            </template>
+            <template v-slot:taskStatus="{ row }">
+              <CommonStatus
+                v-if="row.taskStatus"
+                :statusName="row.taskStatus.text"
+                :statusValue="row.taskStatus.value"
+                type="text"
+              ></CommonStatus>
+              <span v-else>-</span>
+            </template>
+            <template v-slot:inspect="{ row }">
+              <!-- 巡检状态 -->
+              <span v-if="row.inspect && row.inspect.time" :title="row.inspect.time | formatDate">
+                <span :class="[row.inspect.cssClass, {'background-FATAL': row.inspect.value== 'FATAL'}]" class="vertical cursor" @click="toAssetsDetail(row)">{{ row.inspect.text }} </span>
+                <span class="text-title">
+                  {{ handleTime(row.inspect.time) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
+                </span>
+              </span>
+              <span v-else>
+                <span>-</span>
+              </span>
+            </template>
+            <template v-slot:lcu="{row}">
+              <UserCard v-bind="row.lcu" :hideAvatar="true"></UserCard>
+            </template>
+            <template v-slot:lcd="{ row }">
+              <div v-if="row.lcd">{{ row.lcd | formatDate }}</div>
+            </template>
+            <template v-slot:fcu="{ row }">
+              <UserCard v-bind="row.fcu" :hideAvatar="true"></UserCard>
+            </template>
+            <template v-slot:fcd="{ row }">
+              <div v-if="row.fcd">{{ row.fcd | formatDate }}</div>
+            </template>
+            
+            <template v-slot:vendor="{ row }">
+              <!-- 厂商 -->
+              <Tag
+                v-if="!$utils.isEmpty(row.vendor)"
+                class="cursor-pointer"
+                @click.native="toCientityView(row.vendor)"
+              >
+                {{ row.vendor.name }}
+              </Tag>
+              <span v-else></span>
+            </template>
+            <template v-slot:appSystem="{row}">
+              <!-- 应用系统 -->
+              <div v-if="!$utils.isEmpty(row.appSystem)" class="text-href" @click="toCientityView(row.appSystem)">
+                <span :class="row.appSystem.ciIcon"></span>
+                <span>{{ row.appSystem.name }}</span>
+              </div>
+            </template>
+            <template v-slot:appModule="{ row }">
+              <!-- 应用模块 -->
+              <div v-if="!$utils.isEmpty(row.appModule)" class="text-href" @click="toCientityView(row.appModule)">
+                <span :class="row.appModule.ciIcon"></span>
+                <span>{{ row.appModule.name }}</span>
+              </div>
+            </template>
+            <template v-slot:appEnvironment="{ row }">
+              <!-- 环境 -->
+              <Tag
+                v-if="!$utils.isEmpty(row.appEnvironment)"
+                class="cursor-pointer"
+                @click.native="toGlobalAttrManage()"
+              >
+                {{ row.appEnvironment.value }}
+              </Tag>
+            </template>
+            <template v-slot:state="{row}">
+              <!-- 资产状态 -->
+              <Tag
+                v-if="!$utils.isEmpty(row.state)"
+                class="cursor-pointer"
+                @click.native="toCientityView(row.state)"
+              >
+                {{ row.state.name }}
+              </Tag>
+            </template>
+            <template v-slot:ownerList="{ row }">
+              <div v-if="!$utils.isEmpty(row.ownerList)">
+                <Tag
+                  v-for="(o, oindex) in row.ownerList"
+                  :key="oindex"
+                  class="cursor-pointer"
+                  @click.native="toCientityView(o);"
+                >
+                  {{ o.name }}
+                </Tag>
+              </div>
+              <div v-else></div>
+            </template>
+            <template v-slot:businessGroupList="{ row }">
+              <div v-if="!$utils.isEmpty(row.businessGroupList)">
+                <Tag
+                  v-for="(b, bindex) in row.businessGroupList"
+                  :key="bindex"
+                  class="cursor-pointer"
+                  @click.native="toCientityView(b)"
+                >
+                  {{ b.name }}
+                </Tag>
+              </div>
+              <div v-else></div>
+            </template>
+            <template v-slot:ci="{row}">
+              <!-- 模型 -->
+              <div v-if="!$utils.isEmpty(row.ci)" class="text-href" @click="toCiView(row.ci)">
+                <span :class="row.ci.icon"></span>
+                <span>{{ row.ci.label }}</span>
+              </div>
+            </template>
+            <template v-slot:dataCenter="{ row }">
+              <!-- 数据中心 -->
+              <Tag
+                v-if="!$utils.isEmpty(row.dataCenter)"
+                class="cursor-pointer"
+                @click.native="toCientityView(row.dataCenter)"
+              >
+                {{ row.dataCenter.name }}
+              </Tag>
+              <span v-else></span>
+            </template>
+            <template v-slot:expandCollapseArrow="{ row ,index}">
+              <span :class="{ 'tsfont-right': !row._expand, 'tsfont-down open': row._expand }" class="table-icon" @click.stop="openInnerTable(row, tIndex, index)"></span>
+            </template>
+            <template v-slot:expand="{ row }">
+              <ExpandTable v-if="row._expand" style="margin-left: 40px;" :inspectResultList="getInnerTbodyList(row.inspectResult)"></ExpandTable>
+            </template>
+            <template v-slot:action="{ row }">
+              <div class="tstable-action">
+                <ul class="tstable-action-ul">
+                  <li class="tsfont-setting" @click="openRuleThresholdDialog(row)">{{ $t('term.inspect.thresholdrule') }}</li>
+                  <li v-if="row && row.jobPhaseNodeVo && row.jobPhaseNodeVo.jobId" class="tsfont-history" @click="toJobDetail(row)">{{ $t('term.inspect.jobdetail') }}</li>
+                  <li v-if="row.ip" class="tsfont-ci" @click="toCientityView(row.ip)">{{ $t('term.cmdb.viewcientity') }}</li>
+                </ul>
+              </div>
+            </template>
+          </TsTable>
+        </div>
+      </div>
+    </div>
+    <NoData v-else></NoData>
+    <SendEmail
+      v-if="isShowSendEmail"
+      :params="{
+        isNeedAlertDetail: 1,
+        appSystemId: appSystemId,
+        inspectStatusList: inspectStatusList
+      }"
+      @closeSendEmailDialog="closeSendEmailDialog"
+    ></SendEmail>
+    <RuleOfThresholdDialog
+      v-if="isShowRuleThresholdDialog"
+      :appSystemId="appSystemId"
+      :resourceId="resourceId"
+      @close="closeRuleOfThresholdDialog"
+    ></RuleOfThresholdDialog>
+  </div>
+</template>
+<script>
+import download from '@/resources/directives/download.js';
+export default {
+  name: '',
+  components: {
+    UserCard: () => import('@/resources/components/UserCard/UserCard.vue'),
+    TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
+    CommonStatus: () => import('@/resources/components/Status/CommonStatus.vue'),
+    ExpandTable: () => import('@/views/pages/inspect/recentIssues/component/expand-table.vue'),
+    SendEmail: () => import('@/views/pages/inspect/recentIssues/component/send-email.vue'),
+    RuleOfThresholdDialog: () => import('./threshold/rule-of-threshold-dialog.vue')
+  },
+  directives: { download },
+  props: {
+    appSystemId: {
+      // 应用Id
+      type: Number,
+      default: null
+    },
+    appModuleId: {
+      // 模块Id
+      type: Number,
+      default: null
+    }
+  },
+  data() {
+    return {
+      loadingShow: true,
+      isExpandCollapse: true, // 处理展开收起，默认展开
+      isShowSendEmail: false,
+      downloadLoading: false,
+      isShowRuleThresholdDialog: false,
+      typeName: '',
+      envId: null, // 环境ID
+      envList: [], // 环境列表
+      expandCollapseIdList: [], // 展开收起Id列表，下榻页面，返回显示用
+      isBack: false,
+      tableList: [],
+      tableConfig: {
+        tbodyList: [],
+        pageSize: 20,
+        currentPage: 1,
+        rowNum: null
+      }
+      // theadList: [
+      //   {
+      //     title: '',
+      //     key: 'expandCollapseArrow' // 展开收起箭头
+      //   },
+      //   {
+      //     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: this.$t('term.inspect.inspectionjobstatus'),
+      //     key: 'taskStatus'
+      //   },
+      //   {
+      //     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: '',
+      //     key: 'action'
+      //   }
+      // ]
+    };
+  },
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {
+    this.initData();
+  },
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    async initData() {
+      this.tableConfig.currentPage = 1;
+      await this.getEnvList();
+      await this.getInspectStatusList();
+      await this.getTableData();
+    },
+    async getEnvList() {
+      await this.$api.cmdb.applicationManage.getEnvironmenteList().then(res => {
+        if (res.Status == 'OK') {
+          this.envList = res.Return?.tbodyList || [];
+          this.envList.unshift({
+            name: this.$t('term.inspect.allenv'),
+            id: ''
+          });
+          this.envList.push({
+            name: this.$t('term.inspect.noconfigenv'),
+            id: -2
+          });
+          this.envId = this.envId || ''; // 有环境id，就取环境ID的值，否则默认选择所有环境（用于下榻页面返回）
+        }
+      });
+    },
+    async getInspectStatusList() {
+      // 获取巡检状态列表
+      this.inspectStatusList = [];
+      await this.$api.common.getSelectList({enumClass: 'InspectStatus'}).then((res) => {
+        if (res.Status == 'OK') {
+          let nodeList = res.Return || [];
+          if (nodeList && nodeList.length > 0) {
+            nodeList.forEach(item => {
+              if (item && item.value != 'normal') {
+                this.inspectStatusList.push(item.value);
+              }
+            });
+          }
+        }
+      });
+    },
+    getTableData(row, index) {
+      //获取表格数据
+      let params = {
+        appSystemId: this.appSystemId,
+        appModuleId: this.appModuleId,
+        envId: this.envId,
+        inspectStatusList: this.inspectStatusList,
+        currentPage: this.tableConfig.currentPage,
+        pageSize: this.tableConfig.pageSize
+      };
+      this.$addHistoryData('isExpandCollapse', this.isExpandCollapse);
+      this.$addHistoryData('expandCollapseIdList', this.expandCollapseIdList);
+      this.$addHistoryData('envId', this.envId);
+      this.loadingShow = true;
+      this.$api.inspect.applicationInspect.getNewapplicationInspectList(params).then(res => {
+        if (res.Status == 'OK') {
+          if (row && !this.$utils.isEmptyObj(row)) {
+            // 内嵌列表翻页
+            let tableList = (res.Return && res.Return.tableList) ? ((res.Return.tableList.length > index) ? res.Return.tableList[index] : res.Return.tableList[0]) : [];
+            let currentRow = Object.assign({}, row, tableList);
+            this.tableConfig.pageSize = tableList ? tableList.pageSize : 20;
+            this.tableConfig.currentPage = tableList ? tableList.currentPage : 1;
+            this.$set(this.tableList, index, currentRow);
+          } else {
+            this.tableList = res.Return ? res.Return.tableList : [];
+            this.tableConfig.pageSize = 20;
+            this.tableConfig.currentPage = 1;
+          }
+          let resourceIdList = [];
+          if (this.tableList && !this.$utils.isEmpty(this.tableList)) {
+            this.tableList.forEach(item => {
+              if (item && item.tbodyList && !this.$utils.isEmpty(item.tbodyList)) {
+                item.tbodyList.forEach((v) => {
+                  if (v && v.id) {
+                    resourceIdList.push(v.id);
+                  }
+                });
+              }
+            });
+          }
+          if (this.$utils.isEmpty(this.expandCollapseIdList) && this.isExpandCollapse) {
+            // 首次需要把id存起来，下榻页面返回需要使用
+            this.expandCollapseIdList = resourceIdList;
+            this.$addHistoryData('expandCollapseIdList', this.expandCollapseIdList);
+          }
+          this.getInnerTableList(resourceIdList); // 获取内嵌表格数据
+        }
+      }).catch(() => {
+        this.loadingShow = false;
+      });
+    },
+    getInnerTableList(resourceIdList) {
+      // 获取内嵌表格数据
+      this.loadingShow = true;
+      if (resourceIdList && !this.$utils.isEmpty(resourceIdList)) {
+        this.$api.inspect.inspectJob.getRecentIssuesInnerTableList({ resourceIdList: resourceIdList }).then(res => {
+          if (res.Status == 'OK') {
+            let obj = res.Return;
+            this.tableList.forEach(item => {
+              if (item && item.tbodyList && !this.$utils.isEmpty(item.tbodyList)) {
+                item.tbodyList.forEach((v) => {
+                  Object.keys(obj).forEach(n => {
+                    if (v.id == n) {
+                      this.$set(v, 'inspectResult', obj[n] ? Object.values(obj[n]) : []);
+                    }
+                  });
+                });
+              }
+            });
+            if (this.tableList && !this.$utils.isEmpty(this.tableList)) {
+              this.tableList.forEach(val => {
+                if (val && val.tbodyList && !this.$utils.isEmpty(val.tbodyList)) {
+                  val.tbodyList.forEach((v) => {
+                    if (v && v.hasOwnProperty('inspectResult') && !this.$utils.isEmpty(v.inspectResult)) {
+                      if (this.isBack) { // 下榻页面返回，恢复之前展开收起状态
+                        v['_expand'] = !this.$utils.isEmpty(this.expandCollapseIdList) ? this.expandCollapseIdList.includes(v.id) : this.isExpandCollapse;
+                      } else {
+                        v['_expand'] = this.isExpandCollapse;
+                      }
+                    }
+                  });
+                }
+              });
+            }
+          }
+        }).finally(() => {
+          this.loadingShow = false;
+        });
+      } else {
+        this.loadingShow = false;
+      }
+    },
+    changeCurrent(currentPage, item, index) {
+      this.tableConfig.currentPage = currentPage;
+      this.getTableData(item, index);
+    },
+    changePageSize(pageSize, item, index) {
+      this.tableConfig.pageSize = pageSize;
+      this.tableConfig.currentPage = 1;
+      this.getTableData(item, index);
+    },
+    restoreHistory(historyData) {
+      // 下榻页面，返回搜索条件保持一致
+      this.isBack = true;
+      this.envId = historyData['envId'];
+      this.expandCollapseIdList = historyData['expandCollapseIdList'];
+      this.isExpandCollapse = historyData['isExpandCollapse'];
+    },
+    selectedEnv(name) {
+      let envId = null;
+      this.envList.forEach(v => {
+        if (v.name == name) {
+          envId = v.id;
+        }
+      });
+      this.envId = envId;
+      this.tableConfig.currentPage = 1;
+      this.getTableData();
+    },
+    filterTypeFields(row) {
+      // 过滤类型字段，修复控制台报错问题
+      let currentRow = this.$utils.deepClone(row);
+      if (currentRow && currentRow.hasOwnProperty('type')) {
+        delete currentRow.type;
+      }
+      if (currentRow && currentRow.hasOwnProperty('theadList')) {
+        currentRow.theadList.unshift({
+          title: '',
+          key: 'expandCollapseArrow' // 展开收起箭头
+        });
+        currentRow.theadList.push({
+          title: '',
+          key: 'action'
+        });
+      }
+      return currentRow;
+    },
+    handleTime(time) {
+      let data = '-';
+      if (time) {
+        data = Date.parse(new Date()) - time;
+      }
+      return data;
+    },
+    handleExpandCollapseAll() {
+      // 处理展开收起所有(内嵌表格)
+      this.isExpandCollapse = !this.isExpandCollapse;
+      let expandCollapseIdList = [];
+      if (this.tableList && !this.$utils.isEmpty(this.tableList)) {
+        this.tableList.forEach(item => {
+          if (item && item.tbodyList && !this.$utils.isEmpty(item.tbodyList)) {
+            item.tbodyList.forEach((v) => {
+              v['_expand'] = this.isExpandCollapse;
+              if (this.isExpandCollapse) {
+                // 展开，需要存储展开的id
+                expandCollapseIdList.push(v.id);
+              } else {
+                expandCollapseIdList = [];
+              }
+            });
+          }
+        });
+      }
+      this.expandCollapseIdList = expandCollapseIdList;
+      this.$addHistoryData('isExpandCollapse', this.isExpandCollapse);
+      this.$addHistoryData('expandCollapseIdList', expandCollapseIdList);
+    },
+    openInnerTable(row, tIndex, rowIndex) {
+      // 展开收起内嵌表格
+      if (row['_expand']) {
+        row._expand = false;
+        this.$set(this.tableList[tIndex]['tbodyList'], rowIndex, row);
+        this.isExpandCollapse = false;
+        this.expandCollapseIdList && this.expandCollapseIdList.forEach((id, index) => {
+          if (id == row.id) {
+            this.expandCollapseIdList.splice(index, 1);
+          }
+        });
+      } else {
+        row._expand = true;
+        this.$set(this.tableList[tIndex]['tbodyList'], rowIndex, row);
+        this.isExpandCollapse = true;
+        if (!this.expandCollapseIdList.includes(row.id)) {
+          // id没有时，才push进去
+          this.expandCollapseIdList.push(row.id);
+        }
+      }
+      this.$addHistoryData('expandCollapseIdList', this.expandCollapseIdList);
+      this.$addHistoryData('isExpandCollapse', this.isExpandCollapse);
+    },
+    getInnerTbodyList(inspectResult) {
+      // 处理内嵌表格数据
+      let tbodyList = [];
+      if (inspectResult && !this.$utils.isEmpty(inspectResult)) {
+        tbodyList = inspectResult;
+      }
+      return tbodyList;
+    },
+    handleRefresh() {
+      // 处理刷新
+      this.tableConfig.currentPage = 1;
+      this.getTableData();
+    },
+    sendEmail() {
+      // 发送邮件
+      this.isShowSendEmail = true;
+    },
+    closeSendEmailDialog() {
+      this.isShowSendEmail = false;
+    },
+    toAssetsDetail(row) {
+      // 跳转巡检报告页面
+      window.open(HOME + '/inspect.html#/assets-detail-' + row.id, '_blank');
+    },
+    toJobDetail(row) {
+      // 工作详情
+      if (row && row.jobPhaseNodeVo) {
+        window.open(HOME + '/inspect.html#/job-detail?id=' + row.jobPhaseNodeVo.jobId + '&status=' + row.jobPhaseNodeVo.status, '_blank');
+       
+        // this.$router.push({path: '/job-detail?id=' + row.jobPhaseNodeVo.jobId + '&status=' + row.jobPhaseNodeVo.status});
+      }
+    },
+    toCientityView(row) {
+      // 跳转查看配置项页面
+      if (row && !this.$utils.isEmptyObj(row)) {
+        window.open(HOME + '/inspect.html#/ci/' + row.ciId + '/cientity-view/' + row.id, '_blank');
+      }
+      // this.$router.push({path: '/ci/' + row.typeId + '/cientity-view/' + row.id});
+    },
+    toCiView(ci) {
+      if (ci && !this.$utils.isEmptyObj(ci)) {
+        window.open(HOME + '/cmdb.html#/ci-view/' + ci.id, '_blank');
+      }
+    },
+    openRuleThresholdDialog(row) {
+      if (row && row.id) {
+        this.resourceId = row.id;
+        this.isShowRuleThresholdDialog = true;
+      }
+    },
+    closeRuleOfThresholdDialog() {
+      this.isShowRuleThresholdDialog = false;
+    }
+  },
+  filter: {},
+  computed: {
+    downloadUrl() {
+      return {
+        url: 'api/binary/inspect/new/problem/report/export',
+        method: 'post',
+        params: {
+          isNeedAlertDetail: 1,
+          appSystemId: this.appSystemId,
+          inspectStatusList: this.inspectStatusList
+        },
+        changeStatus: status => {
+          if (status == 'start') {
+            this.downloadLoading = true;
+          } else if (status == 'success' || status == 'error') {
+            this.downloadLoading = false;
+          }
+        }
+      };
+    }
+  },
+  watch: {
+    appModuleId(id) {
+      if (id) {
+        this.expandCollapseIdList = [];
+        this.isExpandCollapse = true;
+        this.isBack = false;
+        this.initData();
+      }
+    },
+    appSystemId(id) {
+      if (id && this.$utils.isEmpty(this.appModuleId)) {
+        this.expandCollapseIdList = [];
+        this.isExpandCollapse = true;
+        this.isBack = false;
+        this.initData();
+      }
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+.latest-question-manage-box {
+  .li-box {
+    margin-bottom: -10px;
+  .li-item {
+    padding: 6px 16px;
+    border-radius: 4px;
+    text-align: center;
+    margin-bottom: 10px;
+  }
+ }
+ .table-icon {
+  cursor: pointer;
+  font-size: 14px;
+  visibility: hidden;
+  padding: 1px 3px;
+  &.open {
+    visibility: visible;
+  }
+}
+tr:hover {
+  .table-icon {
+    visibility: visible;
+  }
+ }
+}
+</style>
diff --git a/src/views/pages/inspect/application/threshold/rule-of-threshold-dialog.vue b/src/views/pages/inspect/application/threshold/rule-of-threshold-dialog.vue
index 68adaa5d4..bc3940ff9 100644
--- a/src/views/pages/inspect/application/threshold/rule-of-threshold-dialog.vue
+++ b/src/views/pages/inspect/application/threshold/rule-of-threshold-dialog.vue
@@ -41,7 +41,7 @@ export default {
   components: {},
   props: {
     resourceId: {
-      type: Number
+      type: [Number, String]
     }
   },
   data() {
diff --git a/src/views/pages/inspect/applicationNew/application-detail.vue b/src/views/pages/inspect/applicationNew/application-detail.vue
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/views/pages/inspect/applicationNew/application-manage.vue b/src/views/pages/inspect/applicationNew/application-manage.vue
deleted file mode 100644
index d44fa355d..000000000
--- a/src/views/pages/inspect/applicationNew/application-manage.vue
+++ /dev/null
@@ -1,332 +0,0 @@
-<template>
-  <div>
-    <TsContain :siderWidth="220">
-      <template v-slot:topLeft>
-        <div class="action-group">
-          <span
-            v-if="$AuthUtils.hasRole('RESOURCECENTER_MODIFY')"
-            class="action-item tsfont-plus"
-            @click="addApp()"
-          >{{ $t('page.apply') }}</span>
-          <span
-            v-if="$AuthUtils.hasRole('RESOURCECENTER_MODIFY')"
-            class="action-item tsfont-plus"
-            @click="addAppModule()"
-          >{{ $t('page.module') }}</span>
-          <span
-            v-if="$AuthUtils.hasRole('INSPECT_SCHEDULE_EXECUTE')"
-            class="action-item tsfont-sla"
-            @click="openInspectionScheduleDialog()"
-          >{{ $t('term.inspect.scheduleinspect') }}</span>
-        </div>
-      </template>
-      <template v-slot:topRight>
-        <div v-if="$AuthUtils.hasRole('RESOURCECENTER_MODIFY') && (selectedApp && !selectedModule)" class="action-group">
-          <span
-            class="action-item tsfont-edit"
-            @click="editApp()"
-          >{{ $t('dialog.title.edittarget', {target: $t('page.apply')}) }}</span>
-          <span
-            class="action-item tsfont-trash-o"
-            @click="deleteApp()"
-          >{{ $t('dialog.title.deletetarget', {target: $t('page.apply')}) }}</span>
-          <span
-            class="action-item tsfont-setting"
-            @click="toRoleOfThreshold()"
-          >{{ $t('term.inspect.thresholdrule') }}</span>
-          <div class="action-item">
-            <Button
-              v-auth="'INSPECT_EXECUTE'"
-              type="primary"
-              class="ml-sm mr-sm"
-              @click="openSystemInspection"
-            >{{ $t('term.inspect.inspect') }}</Button>
-          </div>
-        </div>
-        <div v-else-if="$AuthUtils.hasRole('RESOURCECENTER_MODIFY')" class="action-group">
-          <span
-            class="action-item tsfont-edit"
-            @click="editAppModule()"
-          >{{ $t('dialog.title.edittarget', {target: $t('page.module')}) }}</span>
-          <span
-            class="action-item tsfont-trash-o"
-            @click="deleteAppModule()"
-          >{{ $t('dialog.title.deletetarget', {target: $t('page.module')}) }}</span>
-          <Button
-            v-auth="'INSPECT_EXECUTE'"
-            type="primary"
-            class="ml-sm mr-sm"
-            @click="openModuleInspectionDialog"
-          >{{ $t('term.inspect.inspect') }}</Button>
-        </div>
-      </template>
-      <template v-slot:sider>
-        <AppModuleTree
-          ref="appModuleTree"
-          v-model="appModueData"
-          :allowInverse="false"
-          @getSelectedApp="getSelectedApp"
-          @getSelectedModule="getSelectedModule"
-        ></AppModuleTree>
-      </template>
-      <template v-slot:content>
-        <Tabs
-          v-model="tabValue"
-          :animated="false"
-          class="block-tabs"
-          @on-click="tabClick"
-        >
-          <TabPane :label="$t('term.inspect.newproblem')" name="LatestQuestions">
-            <LatestQuestionsManage
-              v-if="tabValue == 'LatestQuestions'"
-              class="tab-height-box"
-              :appSystemId="appCiEntityId"
-              :appModuleId="appModuleId"
-            ></LatestQuestionsManage>
-          </TabPane>
-          <TabPane :label="$t('term.inspect.assetlist')" name="assetsList">
-            <InspectionAssetsManage
-              v-if="tabValue == 'assetsList'"
-              class="tab-height-box"
-              :appSystemId="appCiEntityId"
-              :appModuleId="appModuleId"
-              moduleName="inspect"
-            ></InspectionAssetsManage>
-          </TabPane>
-          <TabPane v-if="selectedApp && !selectedModule" :label="$t('term.deploy.applicationinformation')" name="applicationInfo">
-            <AppInfo v-if="tabValue == 'applicationInfo'" :appSystemId="appCiEntityId"></AppInfo>
-          </TabPane>
-          <TabPane v-else :label="$t('term.deploy.moduleinformation')" name="moduleInfo">
-            <ModuleInfo
-              v-if="tabValue == 'moduleInfo'"
-              :isShowTitle="false"
-              :appSystemId="appCiEntityId"
-              :appModuleId="appModuleId"
-            ></ModuleInfo>
-          </TabPane>
-        </Tabs>
-      </template>
-    </TsContain>
-    <AppEditDialog
-      v-if="isEditAppDialogShow"
-      :ciEntityId="appCiEntityId"
-      :ciId="appCiId"
-      @close="closeAppEditDialog"
-    ></AppEditDialog>
-    <AppModuleEditDialog
-      v-if="isEditAppModuleDialogShow"
-      :ciEntityId="appModuleCiEntityId"
-      :ciId="appModuleCiId"
-      :ciEntityData="ciEntityData"
-      @close="closeAppModuleEditDialog"
-    ></AppModuleEditDialog>
-    <DeleteCiEntityDialog
-      v-if="isDeleteDialogShow"
-      :allowDelete="true"
-      :allowCommit="true"
-      :ciEntityId="deleteCiEntityId"
-      @close="closeDeleteDialog"
-    ></DeleteCiEntityDialog>
-    <InspectionScheduleDialog v-if="isShowInspectionScheduleDialog" :id="scheduleId" @close="isShowInspectionScheduleDialog = false"></InspectionScheduleDialog>
-    <BatchSystemInspectionDialog
-      v-if="isShowBatchInspectionDialog"
-      :inspectionData="selectedApp"
-      @close="isShowBatchInspectionDialog = false"
-    ></BatchSystemInspectionDialog>
-    <BatchModuleInspectionDialog
-      v-if="isShowBatchModuleInspectionDialog"
-      :inspectionData="selectedModule"
-      :appSystemId="appCiEntityId"
-      @close="isShowBatchModuleInspectionDialog = false"
-    ></BatchModuleInspectionDialog>
-  </div>
-</template>
-<script>
-export default {
-  name: '',
-  components: {
-    AppInfo: () => import('@/views/pages/deploy/application-config/config/app/app-info.vue'),
-    ModuleInfo: () => import('@/views/pages/deploy/application-config/config/module/module-info'),
-    AppEditDialog: () => import('@/views/pages/cmdb/application/app-edit-dialog.vue'),
-    AppModuleEditDialog: () => import('@/views/pages/cmdb/application/appmodule-edit-dialog.vue'),
-    DeleteCiEntityDialog: () => import('@/views/pages/cmdb/cientity/cientity-delete-dialog.vue'),
-    InspectionScheduleDialog: () => import('./inspection-schedule-dialog.vue'),
-    AppModuleTree: () => import('@/views/pages/cmdb/application/app-module-tree'), // 应用模块树
-    LatestQuestionsManage: () => import('./latest-questions-manage'), // 最新问题
-    InspectionAssetsManage: () => import('./inspection-assets-manage'), // 资产清单
-    BatchSystemInspectionDialog: () => import('./batch-system-inspection-dialog'), // 批量应用巡检
-    BatchModuleInspectionDialog: () => import('./batch-module-inspection-dialog') // 批量模块巡检
-  },
-  props: {},
-  data() {
-    return {
-      tabValue: '',
-      isApp: true,
-      isEditAppDialogShow: false,
-      isEditAppModuleDialogShow: false,
-      isDeleteDialogShow: false,
-      isShowBatchInspectionDialog: false,
-      isShowBatchModuleInspectionDialog: false,
-      appCiEntityId: null,
-      appCiId: null,
-      appModuleCiId: null,
-      appModuleId: null,
-      deleteCiEntityId: null,
-      selectedApp: null,
-      selectedModule: null,
-      appModueData: {},
-      ciEntityData: {},
-      isShowInspectionScheduleDialog: false,
-      scheduleId: null
-    };
-  },
-  beforeCreate() {},
-  created() {
-    if (this.$route.query.scheduleId) {
-      this.scheduleId = Number(this.$route.query.scheduleId);
-    }
-    if (this.$route.query.isShowInspectionScheduleDialog) {
-      this.isShowInspectionScheduleDialog = this.$route.query.isShowInspectionScheduleDialog;
-    }
-    this.getResourceEntity();
-  },
-  beforeMount() {},
-  mounted() {},
-  beforeUpdate() {},
-  updated() {},
-  activated() {},
-  deactivated() {},
-  beforeDestroy() {},
-  destroyed() {},
-  methods: {
-    openSystemInspection() {
-      this.isShowBatchInspectionDialog = true;
-    },
-    openModuleInspectionDialog() {
-      this.isShowBatchModuleInspectionDialog = true;
-    },
-    tabClick() {
-      this.$addHistoryData('tabValue', this.tabValue);
-    },
-    restoreHistory(historyData) {
-      this.tabValue = historyData['tabValue'];
-    },
-    getSelectedApp(app) {
-      this.selectedApp = app;
-      this.appCiEntityId = app ? app.id : null;
-      this.tabValue = (this.tabValue && this.tabValue == 'moduleInfo' ? 'LatestQuestions' : this.tabValue) || 'LatestQuestions'; // 选中模块信息，但是切换到应用层，tab需要默认选中第一个
-    },
-    getSelectedModule(module) {
-      this.selectedModule = module;
-      this.appModuleId = module ? module.id : null;
-      this.tabValue = (this.tabValue && this.tabValue == 'applicationInfo' ? 'LatestQuestions' : this.tabValue) || 'LatestQuestions'; // 选中应用信息，但是切换到模块层，tab需要默认选中第一个
-    },
-    addApp() {
-      this.appCiEntityId = null;
-      this.isEditAppDialogShow = true;
-    },
-    editApp() {
-      this.appCiEntityId = this.selectedApp ? this.selectedApp.id : null;
-      this.isEditAppDialogShow = true;
-    },
-    editAppModule() {
-      this.appModuleCiEntityId = this.appModuleId;
-      this.isEditAppModuleDialogShow = true;
-    },
-    async addAppModule() {
-      await this.getRelEntityData();
-      this.appModuleCiEntityId = null;
-      this.isEditAppModuleDialogShow = true;
-    },
-    deleteApp() {
-      this.deleteCiEntityId = this.appCiEntityId;
-      this.isDeleteDialogShow = true;
-    },
-    deleteAppModule() {
-      this.deleteCiEntityId = this.appModuleId;
-      this.isDeleteDialogShow = true;
-    },
-    closeAppEditDialog(needRefresh, uuid) {
-      this.isEditAppDialogShow = false;
-      if (needRefresh && uuid) {
-        // 添加应用成功，刷新树列表
-        this.$refs.appModuleTree.refreshApp(uuid);
-      }
-    },
-    closeAppModuleEditDialog(needRefresh, uuid) {
-      this.isEditAppModuleDialogShow = false;
-      if (needRefresh && uuid) {
-        // 添加编辑模块成功，刷新树列表
-        this.$refs.appModuleTree.refreshModule(uuid, this.appCiEntityId);
-      }
-    },
-    closeDeleteDialog(needRefresh) {
-      this.isDeleteDialogShow = false;
-      if (needRefresh) {
-        // 删除应用成功，刷新树列表
-        this.appModueData = {
-          appId: this.appCiEntityId // 删除成功后，默认选中当前应用层
-        };
-        this.$refs.appModuleTree.searchAppSystem();
-      }
-    },
-    getResourceEntity() {
-      this.$api.cmdb.applicationManage.getResourceEntityByName('scence_appsystem').then(res => {
-        if (res.Return && res.Return.ciId) {
-          this.appCiId = res.Return.ciId;
-        }
-      });
-      this.$api.cmdb.applicationManage.getResourceEntityByName('scence_appmodule').then(res => {
-        if (res.Return && res.Return.ciId) {
-          this.appModuleCiId = res.Return.ciId;
-        }
-      });
-    },
-    async getRelEntityData() {
-      // 设置添加模块时，默认选中当前应用
-      this.ciEntityData = {};
-      if (this.appModuleCiId) {
-        let relList = [];
-        let relEntityData = {};
-        await this.$api.cmdb.ci.getRelByCiId(this.appModuleCiId, {needAction: false, showType: 'all'}).then(res => {
-          relList = res.Return || [];
-          relList.forEach(element => {
-            if ((element.direction === 'from' && element.fromCiId == this.appModuleCiId && element.toCiId == this.appCiId) ||
-            (element.direction === 'to' && element.toCiId == this.appModuleCiId && element.fromCiId == this.appCiId)) {
-              relEntityData[`rel${element.direction}_${element.id}`] = {
-                'valueList': [
-                  {
-                    'ciEntityName': this.selectedApp.name, // 应用层的name
-                    'ciEntityId': this.selectedApp.id, // 应用的id
-                    'ciId': this.appModuleCiId
-                  }
-                ]
-              };
-            }
-          });
-          this.ciEntityData = {uuid: this.$utils.setUuid(), relEntityData: relEntityData};
-        });
-      }
-    },
-    openInspectionScheduleDialog() {
-      this.isShowInspectionScheduleDialog = true;
-    },
-    toRoleOfThreshold() {
-      // 阈值规则
-      this.$router.push({
-        path: './rule-of-threshold-manage',
-        query: {appSystemId: this.appCiEntityId}
-      });
-    }
-  },
-  filter: {},
-  computed: {},
-  watch: {}
-};
-</script>
-<style lang="less" scoped>
-.tab-height-box {
-  height: calc(100vh - 100px - 50px); // 100 通栏的表头+导航栏， 50是（tab(高度)+16(底部的间距)
-  overflow-y: auto;
-}
-</style>
diff --git a/src/views/pages/inspect/applicationNew/batch-module-inspection-dialog.vue b/src/views/pages/inspect/applicationNew/batch-module-inspection-dialog.vue
deleted file mode 100644
index c99fa59e0..000000000
--- a/src/views/pages/inspect/applicationNew/batch-module-inspection-dialog.vue
+++ /dev/null
@@ -1,398 +0,0 @@
-<template>
-  <div class="batch-inspection-dialog-box">
-    <TsDialog v-bind="dialogSetting" @on-close="closeDialog">
-      <template v-slot:header>
-        <div>
-          <span>{{ $t('term.inspect.moduleinspect') }}</span>
-          <span style="font-weight: normal;" class="tips text-grey pl-xs">{{ inspectionData.abbrName }} {{ inspectionData.name ? inspectionData.name : '' }}</span>
-        </div>
-      </template>
-      <Loading
-        :loadingShow="loadingShow"
-        type="fix"
-      ></Loading>
-      <ul v-if="hasAssets">
-        <li v-if="!$utils.isEmpty(envList)" class="mt-md">
-          <TsFormCheckbox v-model="checkboxModel" :dataList="checkboxAllDataList" @on-change="checkboxAllChange"></TsFormCheckbox>
-        </li>
-        <li v-if="$utils.isEmpty(envList)" class="text-tip mt-md">
-          {{ $t('term.inspect.noenvconfig') }}
-        </li>
-        <template v-else>
-          <li v-for="(item, index) in envList" :key="index" class="mb-md">
-            <div v-if="item.env && item.env.id && !$utils.isEmpty(item.ciVoList)" class="mb-md mt-md">
-              <TsFormCheckbox
-                v-model="item.value"
-                :dataList="item.dataList"
-                :disabled="$utils.isEmpty(item.ciVoList)"
-                class="checkbox-list-box"
-                @on-change="() => checkboxChange()"
-              ></TsFormCheckbox>
-            </div>
-          </li>
-        </template>
-      </ul>
-      <div v-else>{{ $t('term.inspect.modulenoasset') }}</div>
-      <template v-slot:footer>
-        <div>
-          <Button :ghost="true" @click="closeDialog">{{ $t('page.cancel') }}</Button>
-          <Button v-if="hasAssets" type="primary" @click="okDialog">{{ $t('page.continue') }}</Button>
-        </div>
-      </template>
-    </TsDialog>
-    <TsDialog
-      :title="$t('page.tip')"
-      :okText="$t('page.continue')"
-      width="medium"
-      :isShow="isShowCompobList"
-      @on-close="closeCompobDialog"
-    >
-      <ul>
-        <li v-for="(item, index) in noCompobIdList" :key="index" class="flex-start mb-sm">
-          {{ item.label }}
-          <span v-if="item.toolName" class="text-grey">({{ item.toolName }})</span>
-          {{ $t('page.notconfig') }}
-          <span v-if="$AuthUtils.hasRole('INSPECT_MODIFY')" class="text-href" @click="openInspectionTool(item.toolName)">{{ $t('term.inspect.inspecttool') }}</span>
-          <span v-else class="text-grey">{{ $t('term.inspect.inspecttool') }}</span>
-        </li>
-      </ul>
-      <template v-slot:footer>
-        <div>
-          <Button :ghost="true" @click="closeCompobDialog">{{ $t('page.cancel') }}</Button>
-          <Button v-if="hasContinueBtn" type="primary" @click="confirm">{{ $t('page.continue') }}</Button>
-        </div>
-      </template>
-    </TsDialog>
-    <InspectToolSetting v-if="isShowInspectTool" :keyword="toolName" @close="closeInspectToolSetting"></InspectToolSetting>
-  </div>
-</template>
-<script>
-export default {
-  name: '',
-  components: {
-    TsFormCheckbox: () => import('@/resources/plugins/TsForm/TsFormCheckbox'),
-    InspectToolSetting: () => import('@/views/pages/inspect/definition/components/inspect-tool-setting')
-  },
-  filters: {},
-  props: {
-    inspectionData: {
-      type: Object,
-      default: () => ({})
-    },
-    appSystemId: {
-      // 应用id
-      type: Number,
-      default: null
-    }
-  },
-  data() {
-    return {
-      dialogSetting: {
-        isShow: true,
-        width: 'medium'
-      },
-      checkboxAllDataList: [
-        {
-          text: this.$t('page.selectall'),
-          value: 'all'
-        }
-      ],
-      compobList: [],
-      checkboxModel: [],
-      envList: [],
-      noCompobIdList: [], // 无组合工具id列表
-      isShowCompobList: false,
-      isShowInspectTool: false,
-      toolName: '',
-      loadingShow: false,
-      hasContinueBtn: false
-    };
-  },
-  beforeCreate() {},
-  created() {
-    this.getInspectionList();
-  },
-  beforeMount() {},
-  mounted() {},
-  beforeUpdate() {},
-  updated() {},
-  activated() {},
-  deactivated() {},
-  beforeDestroy() {},
-  destroyed() {},
-  methods: {
-    async closeInspectToolSetting(needRefresh) {
-      // 关闭巡检
-      this.isShowInspectTool = false;
-      // if (needRefresh) {
-      //   this.isShowCompobList = false;
-      //   await this.okDialog();
-      // }
-    },
-    checkboxAllChange(val) {
-      if (val && val.length > 0) {
-        this.checkboxModel = ['all'];
-        this.envList &&
-          this.envList.forEach(item => {
-            item.value = this.getIdByDataList(item.dataList, item.ciVoList);
-          });
-      } else {
-        this.checkboxModel = [];
-        this.envList &&
-          this.envList.forEach(item => {
-            item.value = [];
-          });
-      }
-    },
-    checkboxChange() {
-      let checkboxList = this.envList.filter((item) => {
-        return item.value && item.value.length > 0 && item.ciVoList.length > 0;
-      });
-      let envList = this.envList.filter((item) => {
-        return item.ciVoList && item.ciVoList.length > 0;
-      });
-      if (checkboxList && !this.$utils.isEmpty(checkboxList) && !this.$utils.isEmpty(envList) && (checkboxList.length == envList.length)) {
-        // 全选选中
-        this.checkboxModel = ['all'];
-      } else {
-        this.checkboxModel = [];
-      }
-    },
-    getInspectionList() {
-      this.checkboxModel = [];
-      this.envList = [];
-      this.$set(this.dialogSetting, 'isShow', true);
-      this.loadingShow = true;
-      this.$api.inspect.applicationInspect
-        .getResourceTypeList({ appModuleId: this.inspectionData.id })
-        .then(res => {
-          if (res && res.Status == 'OK') {
-            this.envList = res.Return;
-            this.envList &&
-              this.envList.forEach(item => {
-                item.dataList = [{ text: item.env && item.env.name ? `${item.env.name}${this.$t('page.environment')}` : '', value: item.env && item.env.id ? item.env.id : null }];
-                item.value = [];
-              });
-          }
-        })
-        .finally(() => {
-          this.loadingShow = false;
-        });
-    },
-    getIdByDataList(dataList, ciVoList) {
-      let idList = [];
-      dataList &&
-        dataList.forEach(item => {
-          if (!this.$utils.isEmpty(ciVoList)) {
-            // 处理没有的数据
-            idList.push(item.value);
-          }
-        });
-      return idList;
-    },
-    isValid() {
-      let isValid = true;
-      let copyEnvList = this.$utils.deepClone(this.envList);
-      if (copyEnvList && !this.$utils.isEmpty(copyEnvList)) {
-        let emptyList = copyEnvList.filter(val => {
-          return !this.$utils.isEmpty(val.value);
-        });
-        if (this.$utils.isEmpty(emptyList)) {
-          this.$Message.warning(this.$t('term.inspect.selectenv'));
-          isValid = false;
-        }
-      }
-      return isValid;
-    },
-    getEnvList() {
-      let envList = [];
-      let copyEnvList = this.$utils.deepClone(this.envList);
-      copyEnvList && copyEnvList.forEach((env) => {
-        if (env && !this.$utils.isEmpty(env.value)) {
-          let envIdList = env.value.filter(envId => envId && envId != '');
-          if (envIdList && envIdList.length > 0) {
-            envIdList.forEach(envId => {
-              envList.push({
-                envId: envId,
-                appModuleIdList: [this.inspectionData.id]
-              });
-            });
-          }
-        }
-      });
-      return envList;
-    },
-    confirm() {
-      if (!this.isValid()) {
-        return false;
-      }
-      let envList = this.getEnvList();
-      const param = {
-        appSystemId: this.appSystemId,
-        envList: envList
-      };
-      this.$api.inspect.applicationInspect.createInspectAppJob(param).then((res) => {
-        this.loadingShow = true;
-        if (res.Status == 'OK') {
-          this.$Message.success(this.$t('message.executesuccess'));
-          this.loadingShow = false;
-          this.dialogSetting.isShow = false;
-          this.isShowCompobList = false;
-          this.closeDialog();
-        }
-      }).finally(() => {
-        this.loadingShow = false;
-      });
-    },
-    async okDialog() {
-      // 执行操作
-      this.compobList = [];
-      let flag = 0;
-      let envList = this.$utils.deepClone(this.envList) || [];
-      if (!this.isValid()) {
-        return false;
-      }
-      this.loadingShow = true;
-      for (let i = 0; i < envList.length; i++) {
-        if (envList[i] && envList[i].ciVoList.length > 0 && (envList[i].value && envList[i].value.length > 0)) {
-          for (let v = 0; v < envList[i].ciVoList.length; v++) {
-            if (envList[i].ciVoList[v]) {
-              flag++;
-              await this.$api.inspect.applicationInspect.getCombopIdByTypeId({ ciId: envList[i].ciVoList[v].id, resourceId: null }).then(innerRes => {
-                if (innerRes.Status == 'OK') {
-                  let returnValue = innerRes.Return;
-                  if (returnValue && returnValue.isHasBindCombop == 1) {
-                    this.compobList.push({
-                      combopId: returnValue.combop ? returnValue.combop.id : null,
-                      id: envList[i].ciVoList[v].id,
-                      label: envList[i].ciVoList[v].label,
-                      envId: envList[i].env.id
-                    });
-                  } else {
-                    this.noCompobIdList.push({
-                      id: envList[i].ciVoList[v].id,
-                      label: envList[i].ciVoList[v].label,
-                      toolName: envList[i].ciVoList[v].name
-                    });
-                  }
-                }
-              }).finally(() => {
-                let ajaxNumber = 0;
-                envList && envList.forEach((fv) => {
-                  fv && !this.$utils.isEmpty(fv.value) && fv.ciVoList && fv.ciVoList.forEach((fn) => {
-                    if (fn && fn.id) {
-                      ajaxNumber++;
-                    }
-                  });
-                });
-                if (ajaxNumber && flag && ajaxNumber == flag) {
-                  this.loadingShow = false;
-                }
-              });
-            }
-          }
-        }
-      }
-      this.noCompobIdList = this.$utils.uniqueByField(this.noCompobIdList, 'id'); // 数组去重
-      if (this.$utils.isEmpty(this.noCompobIdList)) {
-        // this.handleContinue();
-        this.confirm();
-      } else {
-        this.isShowCompobList = true;
-        if (this.$utils.isEmpty(this.compobList)) {
-          this.hasContinueBtn = false; // 一个配置都没有，不显示继续按钮
-        } else {
-          this.hasContinueBtn = true;
-        }
-      }
-    },
-    closeCompobDialog() {
-      this.noCompobIdList = [];
-      this.isShowCompobList = false;
-    },
-    closeDialog() {
-      this.$emit('close');
-    },
-    handleContinue() {
-      // 继续执行
-      let flag = 0;
-      let paramsList = [];
-      let handleDataList = [];
-      this.loadingShow = true;
-      this.compobList.forEach(item => {
-        let tempObj = handleDataList.find((v) => v.id == item.id);
-        if (tempObj) {
-          tempObj.envIdList.push(item.envId);
-        } else {
-          handleDataList.push({
-            envId: item.envId,
-            id: item.id,
-            label: item.label,
-            combopId: item.combopId,
-            envIdList: [item.envId]
-          });
-        }
-      });
-      handleDataList.forEach(v => {
-        if (v && v.id && v.combopId) {
-          paramsList.push({
-            combopId: v.combopId,
-            name: v.label,
-            source: 'inspectapp',
-            invokeId: v.id,
-            routeId: this.appSystemId,
-            roundCount: 64,
-            param: {},
-            executeConfig: {
-              executeNodeConfig: {
-                filter: {
-                  typeIdList: [v.id],
-                  envIdList: v.envIdList,
-                  appModuleIdList: [this.inspectionData.id],
-                  appSystemIdList: [this.appSystemId]
-                }
-              }
-            }
-          });
-        }
-      });
-      paramsList &&
-        paramsList.forEach(item => {
-          this.$api.inspect.applicationInspect.executeInspect(item).then(res => {
-            if (res.Status == 'OK') {
-              flag++;
-              if (flag == paramsList.length) {
-                this.$Message.success(this.$t('message.executesuccess'));
-                this.loadingShow = false;
-                this.dialogSetting.isShow = false;
-                this.isShowCompobList = false;
-              }
-            }
-          }).catch(() => {
-            this.loadingShow = false;
-          });
-        });
-    },
-    openInspectionTool(toolName) {
-      // 打开巡检定义页面
-      this.toolName = toolName || '';
-      this.isShowInspectTool = true;
-    }
-  },
-  computed: {
-    hasAssets() {
-      // 是否有关联资产
-      let ciVoList = this.envList && this.envList.filter((v) => {
-        return v && v.ciVoList && v.ciVoList.length > 0;
-      });
-      if (this.$utils.isEmpty(ciVoList)) {
-        return false;
-      } else {
-        return true;
-      }
-    }
-  },
-  watch: {}
-};
-</script>
-<style lang="less" scoped></style>
diff --git a/src/views/pages/inspect/applicationNew/batch-system-inspection-dialog.vue b/src/views/pages/inspect/applicationNew/batch-system-inspection-dialog.vue
deleted file mode 100644
index 8716c2c9f..000000000
--- a/src/views/pages/inspect/applicationNew/batch-system-inspection-dialog.vue
+++ /dev/null
@@ -1,409 +0,0 @@
-<template>
-  <div class="batch-inspection-dialog-box">
-    <TsDialog
-      :isShow="true"
-      @on-close="closeDialog"
-    >
-      <Loading
-        :loadingShow="loadingShow"
-        type="fix"
-      ></Loading>
-      <template v-slot:header>
-        <div>
-          <span>{{ $t('term.inspect.appinspect') }}</span>
-          <span style="font-weight: normal;" class="tips text-grey pl-xs">{{ inspectionData.abbrName }} {{ inspectionData.name ? (inspectionData.name) : '' }}</span>
-        </div>
-      </template>
-      <ul v-if="!$utils.isEmpty(envModuleList)">
-        <li class="mt-md">
-          <TsFormCheckbox
-            v-model="checkboxModel"
-            :dataList="checkboxAllDataList"
-            @on-change="checkboxAllChange"
-          ></TsFormCheckbox>
-        </li>
-        <li v-for="(item, index) in envModuleList" :key="index">
-          <div class="h4 mb-md mt-md">{{ item.name }}{{ $t('page.environment') }}</div>
-          <TsFormCheckbox
-            v-model="item.value"
-            :dataList="item.appModuleList"
-            valueName="id"
-            textName="label"
-            class="checkbox-list-box"
-            @on-change="(selectedList) => changeCheckbox(selectedList, item, index)"
-          ></TsFormCheckbox>
-        </li>
-      </ul>
-      <div v-else class="mt-md">{{ $t('term.inspect.appnoasset') }}</div>
-      <template v-slot:footer>
-        <div>
-          <Button :ghost="true" @click="closeDialog">{{ $t('page.cancel') }}</Button>
-          <Button v-if="!$utils.isEmpty(envModuleList)" type="primary" @click="confirm">{{ $t('page.continue') }}</Button>
-        </div>
-      </template>
-    </TsDialog>
-    <TsDialog
-      :title="$t('page.tip')"
-      :isShow="isShowCompobDialog"
-      @on-close="closeCompobDialog"
-    >
-      <ul>
-        <li v-for="(item, index) in noCompobIdList" :key="index" class="flex-start mb-nm">
-          {{ item.label }}<span v-if="item.typeName" class="text-grey">({{ item.typeName }})</span>
-          {{ $t('page.notconfig') }}<span v-if="$AuthUtils.hasRole('INSPECT_MODIFY')" class="text-href" @click="openInspectionTool(item.typeName)">{{ $t('term.inspect.inspecttool') }}</span>
-          <span v-else class="text-grey">{{ $t('term.inspect.inspecttool') }}</span>
-        </li>
-      </ul>
-      <template v-slot:footer>
-        <div>
-          <Button :ghost="true" @click="closeCompobDialog">{{ $t('page.cancel') }}</Button>
-          <Button v-if="hasContinueBtn" type="primary" @click="okCompobDialog">{{ $t('page.continue') }}</Button>
-        </div>
-      </template>
-    </TsDialog>
-    <InspectToolSetting v-if="isShowInspectTool" :keyword="typeName" @close="closeInspectToolSetting"></InspectToolSetting>
-  </div>
-</template>
-<script>
-export default {
-  name: '',
-  components: {
-    TsFormCheckbox: () => import('@/resources/plugins/TsForm/TsFormCheckbox'),
-    InspectToolSetting: () => import('@/views/pages/inspect/definition/components/inspect-tool-setting')
-  },
-  filters: {},
-  props: {
-    inspectionData: {
-      type: Object,
-      default: () => ({})
-    }
-  },
-  data() {
-    return {
-      checkboxAllDataList: [{
-        text: this.$t('page.selectall'),
-        value: 'all'
-      }],
-      defaultDialogList: [],
-      checkboxModel: [],
-      envModuleList: [],
-      noCompobIdList: [], // 巡检没有配置组合工具列表
-      subDataList: [],
-      isShowCompobDialog: false,
-      hasContinueBtn: false,
-      loadingShow: false,
-      isShowInspectTool: false,
-      typeName: '' // 巡检工具名称
-    };
-  },
-  beforeCreate() {},
-  created() {
-    this.getInspectionList();
-  },
-  beforeMount() {},
-  mounted() {},
-  beforeUpdate() {},
-  updated() {},
-  activated() {},
-  deactivated() {},
-  beforeDestroy() {},
-  destroyed() {},
-  methods: {
-    async closeInspectToolSetting(needRefresh) {
-      this.isShowInspectTool = false;
-      // if (needRefresh) {
-      //   this.isShowCompobDialog = false;
-      //   await this.okDialog();
-      // }
-    },
-    changeCheckbox(selectedList, row, index) {
-      let appModuleList = this.$utils.deepClone(row.appModuleList);
-      let filterCiVoList = [];
-      let allListNumber = null; // 总条数
-      let selectedListNumber = null; // 选中数量
-      if (row.checkboxFlag == 'all' || row.checkboxFlag == 'cancel') {
-        filterCiVoList = appModuleList && appModuleList.filter((val) => {
-          return val.id;
-        });
-      }
-      if (selectedList && selectedList.length != row.appModuleList.length && row.checkboxFlag == 'all' && selectedList.includes('')) {
-        // 取消单个
-        row.value = row.value.filter((val) => val);
-        row.checkboxFlag = 'cancel';
-        this.$set(this.envModuleList, index, row);
-        this.checkboxModel = [];
-      } else if (selectedList && selectedList.length == 1 && selectedList.includes('') && row.checkboxFlag == 'all') {
-        // 点击所有，全选
-        row.value = this.getIdByAppModuleList(row.appModuleList);
-        row.checkboxFlag = 'all';
-        this.$set(this.envModuleList, index, row);
-      } else if (selectedList && selectedList.length == filterCiVoList.length && row.checkboxFlag == 'all' && !selectedList.includes('')) {
-        // 点击所有，取消
-        row.value = [];
-        row.checkboxFlag = 'cancel';
-        this.$set(this.envModuleList, index, row);
-        this.checkboxModel = [];
-      } else if (selectedList && selectedList.length == filterCiVoList.length && row.checkboxFlag == 'cancel' && !selectedList.includes('')) {
-        row.value = this.getIdByAppModuleList(row.appModuleList);
-        row.checkboxFlag = 'all';
-        this.$set(this.envModuleList, index, row);
-      } else if (selectedList && row.checkboxFlag == 'cancel' && selectedList.includes('')) {
-        row.value = this.getIdByAppModuleList(row.appModuleList);
-        row.checkboxFlag = 'all';
-        this.$set(this.envModuleList, index, row);
-      }
-      this.envModuleList && this.envModuleList.forEach((val) => {
-        allListNumber += val.appModuleList.length; // 所有的数量
-        selectedListNumber += val.value.length;
-      });
-      if (allListNumber == selectedListNumber) {
-        this.checkboxModel = ['all']; // 全选勾选
-      }
-    },
-    checkboxAllChange(val) {
-      if (val && val.length > 0) {
-        this.envModuleList && this.envModuleList.forEach((item) => {
-          item.value = this.getIdByAppModuleList(item.appModuleList);
-          item.checkboxFlag = 'all';
-        });
-      } else {
-        this.envModuleList && this.envModuleList.forEach((item) => {
-          item.value = [];
-          item.checkboxFlag = 'cancel';
-        });
-      }
-    },
-    getInspectionList() {
-      this.checkboxModel = [];
-      this.loadingShow = true;
-      let params = {
-        appSystemId: this.inspectionData.id
-      };
-      this.$api.inspect.applicationInspect.getInspectionList(params).then((res) => {
-        if (res && res.Status == 'OK') {
-          this.envModuleList = res.Return;
-          this.envModuleList && this.envModuleList.forEach((item) => {
-            item && item.appModuleList.forEach((v) => {
-              v.label = v.abbrName ? (v.name ? `${v.abbrName}(${v.name})` : v.abbrName) : v.name || '';
-            });
-            item.appModuleList.unshift({
-              label: this.$t('term.deploy.allmodule'),
-              id: ''
-            });
-            item.checkboxFlag = 'cancel';
-            item.value = [];
-          });
-        }
-      }).finally(() => {
-        this.loadingShow = false;
-      });
-    },
-    getIdByAppModuleList(appModuleList) {
-      // 获取id列表，根据模块id
-      let idList = [];
-      appModuleList && appModuleList.forEach((item) => {
-        idList.push(item.id);
-      });
-      return idList;
-    },
-    isValid() {
-      let isValid = true;
-      let copyEnvModuleList = this.$utils.deepClone(this.envModuleList);
-      if (copyEnvModuleList && !this.$utils.isEmpty(copyEnvModuleList)) {
-        let emptyList = copyEnvModuleList.filter((val) => {
-          return !this.$utils.isEmpty(val.value);
-        });
-        if (this.$utils.isEmpty(emptyList)) {
-          this.$Message.warning(this.$t('term.inspect.selectmodule'));
-          isValid = false;
-        }
-      }
-      return isValid;
-    },
-    getEnvList() {
-      let envList = [];
-      let copyEnvModuleList = this.$utils.deepClone(this.envModuleList);
-      copyEnvModuleList && copyEnvModuleList.forEach((env) => {
-        if (env && env.appModuleList && env.appModuleList.length > 0 && !this.$utils.isEmpty(env.value)) {
-          let moduleIdList = env.value.filter(moduleId => moduleId && moduleId != '');
-          if (moduleIdList && moduleIdList.length > 0) {
-            envList.push({
-              envId: env.id,
-              appModuleIdList: moduleIdList
-            });
-          }
-        }
-      });
-      return envList;
-    },
-    confirm() {
-      if (!this.isValid()) {
-        return false;
-      }
-      let envList = this.getEnvList();
-      const param = {
-        appSystemId: this.inspectionData.id,
-        envList: envList
-      };
-      this.$api.inspect.applicationInspect.createInspectAppJob(param).then((res) => {
-        this.loadingShow = true;
-        if (res.Status == 'OK') {
-          this.$Message.success(this.$t('message.executesuccess'));
-          this.isShowCompobDialog = false;
-          this.closeDialog();
-        }
-      }).finally(() => {
-        this.loadingShow = false;
-      });
-    },
-    handleDataList() {
-      // 处理获取组合工具id的数据
-      let dataList = [];
-      let copyEnvModuleList = this.$utils.deepClone(this.envModuleList);
-      copyEnvModuleList && copyEnvModuleList.forEach((a) => {
-        if (a && a.appModuleList && a.appModuleList.length > 0 && !this.$utils.isEmpty(a.value)) {
-          a.appModuleList.forEach((b) => {
-            if (b && b.ciList && !this.$utils.isEmpty(b.ciList)) {
-              b.ciList.forEach((c) => {
-                if (c && c.id) {
-                  dataList.push({
-                    envId: a.id,
-                    appModuleId: b.id,
-                    ciLabel: c.label,
-                    ciId: c.id,
-                    typeName: c.name,
-                    value: a.value.includes(b.id) ? a.value : []
-                  });
-                }
-              });
-            }
-          });
-        }
-      });
-      return dataList;
-    },
-    async okDialog() {
-      // 执行操作
-      this.noCompobIdList = [];
-      if (!this.isValid()) {
-        return false;
-      }
-      this.loadingShow = true;
-      let ajaxFinishedFlag = 0;
-      let dataList = this.handleDataList();
-      let submitDataList = [];
-      for (let i = 0; i < dataList.length; i++) {
-        if (dataList[i] && dataList[i].value && dataList[i].value.length > 0) {
-          await this.$api.inspect.applicationInspect.getCombopIdByTypeId({ciId: dataList[i].ciId, resourceId: null}).then((res) => {
-            if (res.Status == 'OK') {
-              let returnValue = res.Return;
-              ajaxFinishedFlag = ajaxFinishedFlag + 1;
-              if (returnValue && returnValue.isHasBindCombop == 1) {
-                dataList[i].combopId = returnValue.combop ? returnValue.combop.id : null;
-              } else if (returnValue && returnValue.isHasBindCombop == 0) {
-                // 没有绑定组合工具
-                this.noCompobIdList.push({
-                  id: dataList[i].ciId,
-                  label: dataList[i].ciLabel,
-                  typeName: dataList[i].typeName
-                });
-              }
-            }
-          }).finally(() => {
-            let ajaxNumber = dataList.filter((v) => {
-              return v.value && v.value.length > 0;
-            });
-            if (ajaxFinishedFlag == ajaxNumber.length) {
-              this.loadingShow = false;
-            }
-          });
-        }
-      }
-      dataList.forEach((item) => {
-        // 合并appModuleIdList
-        if (item && item.combopId) {
-          let tempObj = submitDataList.find((v) => v.envId == item.envId && v.ciId == item.ciId);
-          if (tempObj) {
-            tempObj.appModuleIdList.push(item.appModuleId);
-          } else {
-            submitDataList.push({
-              envId: item.envId,
-              ciId: item.ciId,
-              ciLable: item.ciLabel,
-              appModuleId: item.appModuleId,
-              appModuleIdList: [item.appModuleId],
-              combopId: item.combopId
-            });
-          }
-        }
-      });
-      this.subDataList = [];
-      submitDataList.forEach((item) => {
-        this.subDataList.push({
-          combopId: item.combopId,
-          name: item.ciLable,
-          source: 'inspectapp',
-          invokeId: item.ciId,
-          routeId: this.inspectionData.id,
-          roundCount: 64,
-          param: {},
-          executeConfig: {
-            executeNodeConfig: {
-              filter: {
-                typeIdList: [item.ciId],
-                envIdList: [item.envId],
-                appModuleIdList: item.appModuleIdList,
-                appSystemIdList: [this.inspectionData.id]
-              }
-            }
-          }
-        });
-      });
-      this.noCompobIdList = this.$utils.uniqueByField(this.noCompobIdList, 'id'); // 数组去重
-      if (!this.$utils.isEmpty(this.noCompobIdList)) {
-        this.isShowCompobDialog = true;
-        if (this.$utils.isEmpty(submitDataList)) {
-          this.hasContinueBtn = false; // 一个配置工具都没有，则不显示继续按钮
-        } else {
-          this.hasContinueBtn = true;
-        }
-      } else {
-        // 全部都是有组合工具id，直接提交请求
-        this.okCompobDialog();
-      }
-    },
-    closeDialog() {
-      this.$emit('close');
-    },
-    closeCompobDialog() {
-      this.isShowCompobDialog = false;
-    },
-    okCompobDialog() {
-      let flag = 0;
-      this.subDataList && this.subDataList.forEach((item) => {
-        this.$api.inspect.applicationInspect.executeInspect(item).then((res) => {
-          if (res.Status == 'OK') {
-            flag++;
-            if (flag == this.subDataList.length) {
-              this.$Message.success(this.$t('message.executesuccess'));
-              this.isShowCompobDialog = false;
-              this.closeDialog();
-            }
-          }
-        }).catch(() => {
-          this.loadingShow = false;
-        });
-      });
-    },
-    openInspectionTool(typeName) {
-      // 打开巡检定义页面
-      this.typeName = typeName || '';
-      this.isShowInspectTool = true;
-    }
-  },
-  computed: {},
-  watch: {}
-};
-</script>
-<style lang="less" scoped>
-</style>
diff --git a/src/views/pages/inspect/applicationNew/edit-cron-dialog.vue b/src/views/pages/inspect/applicationNew/edit-cron-dialog.vue
deleted file mode 100644
index a7ba7a03b..000000000
--- a/src/views/pages/inspect/applicationNew/edit-cron-dialog.vue
+++ /dev/null
@@ -1,135 +0,0 @@
-<template>
-  <TsDialog v-bind="dialogConfig" @on-close="close" @on-ok="save">
-    <template v-slot>
-      <div>
-        <TsForm
-          ref="form"
-          v-model="formData"
-          :item-list="formConfig"
-          type="type"
-          label-position="right"
-        >
-        </TsForm>
-      </div>
-    </template>
-  </TsDialog>
-</template>
-<script>
-import TsForm from '@/resources/plugins/TsForm/TsForm';
-export default {
-  name: '',
-  components: {
-    TsForm
-  },
-  filters: {},
-  props: {
-    scheduleData: {
-      type: Object
-    }
-  },
-  data() {
-    return {
-      dialogConfig: {
-        type: 'modal',
-        title: this.$t('term.pbc.cromexpression'),
-        maskClose: false,
-        isShow: true,
-        width: 'medium'
-      },
-      formData: {},
-      formConfig: {
-        appSystemId: {
-          type: 'text',
-          isHidden: true
-        },
-        name: {
-          label: this.$t('page.apply'),
-          type: 'text',
-          disabled: true
-        },
-        isActive: {
-          type: 'radio',
-          label: this.$t('term.report.isactive'),
-          validateList: [
-            {
-              name: 'required',
-              message: this.$t('form.placeholder.pleaseselect', {target: this.$t('page.status')})
-            }
-          ],
-          dataList: [
-            {
-              value: 1,
-              text: this.$t('page.enabled')
-            },
-            {
-              value: 0,
-              text: this.$t('page.disable')
-            }
-          ]
-        },
-        cron: {
-          type: 'quartz',
-          label: this.$t('term.pbc.timeplan'),
-          showType: 'edit',
-          validateList: ['required'],
-          config: {direction: 'down'}
-        },
-        timerange: {
-          label: this.$t('page.startplan') + '/' + this.$t('page.finishplan'),
-          type: 'datetimerange',
-          transfer: true
-        }
-      }
-    };
-  },
-  beforeCreate() {},
-  created() {
-    this.getSchedule();
-  },
-  beforeMount() {},
-  mounted() {},
-  beforeUpdate() {},
-  updated() {},
-  activated() {},
-  deactivated() {},
-  beforeDestroy() {},
-  destroyed() {},
-  methods: {
-    close(needRefresh) {
-      this.$emit('close', needRefresh);
-    },
-    save() {
-      const form = this.$refs.form;
-      if (form && form.valid()) {
-        if (this.formData.timerange && this.formData.timerange.length > 0) {
-          this.formData.beginTime = this.formData.timerange[0];
-          this.formData.endTime = this.formData.timerange[1];
-        }
-        this.$api.inspect.applicationInspect.saveSchedule(this.formData).then(res => {
-          if (res.Status == 'OK') {
-            this.$Message.success(this.$t('message.executesuccess'));
-            this.close(true);
-          }
-        });
-      }
-    },
-    getSchedule() {
-      if (this.scheduleData.id) {
-        this.$api.inspect.applicationInspect.getSchedule(this.scheduleData.id).then(res => {
-          this.formData = res.Return;
-          this.$set(this.formData, 'name', this.scheduleData.appSystemAbbrName + '(' + this.scheduleData.appSystemName + ')');
-          if (this.formData.beginTime && this.formData.endTime) {
-            this.$set(this.formData, 'timerange', [this.formData.beginTime, this.formData.endTime]);
-          }
-        });
-      } else {
-        this.$set(this.formData, 'name', this.scheduleData.appSystemAbbrName + '(' + this.scheduleData.appSystemName + ')');
-        this.$set(this.formData, 'appSystemId', this.scheduleData.appSystemId);
-      }
-    }
-  },
-  computed: {},
-  watch: {}
-};
-</script>
-<style scoped lang="less"></style>
diff --git a/src/views/pages/inspect/applicationNew/inspection-assets-manage.vue b/src/views/pages/inspect/applicationNew/inspection-assets-manage.vue
deleted file mode 100644
index 718e94837..000000000
--- a/src/views/pages/inspect/applicationNew/inspection-assets-manage.vue
+++ /dev/null
@@ -1,457 +0,0 @@
-<template>
-  <div class="inspection-assets-manage-wrap padding">
-    <Loading :loadingShow="loadingShow" type="fix"></Loading>
-    <div v-if="envList && envList.length > 0" class="pb-sm li-box">
-      <Row :gutter="16">
-        <Col
-          v-for="item in envList"
-          :key="item.id"
-          :xs="12"
-          :sm="8"
-          :md="6"
-          :lg="4"
-          :xl="3"
-          :xxl="2"
-        >
-          <div
-            v-if="item.name"
-            class="li-item text-action"
-            :class="envId == item.id ? 'li-active li-text border-primary' : 'border-base bg-op'"
-            @click="selectedEnv(item.name)"
-          >{{ item.name }}</div>
-        </Col>
-      </Row>
-    </div>
-    <div v-if="tableList && tableList.length > 0 ">
-      <div v-for="(item, index) in tableList" :key="index">
-        <div class="h3 padding-sm">{{ item.viewLabel }}</div>
-        <TsTable
-          v-bind="filterTypeFields(item)"
-          @changeCurrent="(currentPage) => changeCurrent(currentPage, item, index)"
-          @changePageSize="(pageSize) => changePageSize(pageSize,item, index)"
-        >
-          <template v-slot:ip="{ row }">
-            <span class="text-href" @click.stop="gotoDetails(row)">
-              <span>{{ row.ip.ip }}</span>
-              <span v-if="row.ip.port">:{{ row.ip.port }}</span>
-            </span>
-          </template>
-          <template v-slot:allIpList="{ row }">
-            <div v-if="!$utils.isEmpty(row.allIpList)">
-              <Tag
-                v-for="(v, vindex) in row.allIpList"
-                :key="vindex"
-                class="cursor-pointer"
-                @click.native="toCientityView(v)"
-              >
-                {{ v.name }}
-              </Tag>
-            </div>
-            <div v-else></div>
-          </template>
-          <template v-slot:lcu="{row}">
-            <UserCard v-bind="row.lcu" :hideAvatar="true"></UserCard>
-          </template>
-          <template v-slot:lcd="{ row }">
-            <div v-if="row.lcd">{{ row.lcd | formatDate }}</div>
-          </template>
-          <template v-slot:fcu="{ row }">
-            <UserCard v-bind="row.fcu" :hideAvatar="true"></UserCard>
-          </template>
-          <template v-slot:fcd="{ row }">
-            <div v-if="row.fcd">{{ row.fcd | formatDate }}</div>
-          </template>
-          <template v-slot:monitor="{ row }">
-            <!-- 监控状态 -->
-            <span v-if="row.monitor && row.monitor.time" :title="row.monitor.time | formatDate">
-              <span :class="[row.monitor.cssClass, {'background-FATAL': row.monitor.value== 'FATAL'}]" class="vertical">{{ row.monitor.text }} </span>
-              <span class="text-title">
-                {{ handleTimes(row.monitor.time) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
-              </span>
-            </span>
-            <span v-else></span>
-          </template>
-          <template v-slot:inspect="{ row }">
-            <!-- 巡检状态 -->
-            <span v-if="row.inspect && row.inspect.time" :title="row.inspect.time | formatDate">
-              <span :class="[row.inspect.cssClass, {'background-FATAL': row.inspect.value== 'FATAL'}]" class="vertical cursor" @click="toInspectStatusDetail(row)">{{ row.inspect.text }} </span>
-              <span class="text-title">
-                {{ handleTimes(row.inspect.time) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
-              </span>
-            </span>
-            <span v-else>
-              <span>-</span>
-            </span>
-          </template>
-          <template v-slot:taskStatus="{ row }">
-            <CommonStatus
-              v-if="row.taskStatus"
-              :statusName="row.taskStatus.text"
-              :statusValue="row.taskStatus.value"
-              type="text"
-            ></CommonStatus>
-            <span v-else>-</span>
-          </template>
-          <template v-slot:vendor="{ row }">
-            <Tag
-              v-if="!$utils.isEmpty(row.vendor)"
-              class="cursor-pointer"
-              @click.native="toCientityView(row.vendor)"
-            >
-              {{ row.vendor.name }}
-            </Tag>
-            <span v-else></span>
-          </template>
-          <template v-slot:appModule="{ row }">
-            <div v-if="!$utils.isEmpty(row.appModule)" class="text-href" @click="toCientityView(row.appModule)">
-              <span :class="row.appModule.ciIcon"></span>
-              <span>{{ row.appModule.name }}</span>
-            </div>
-          </template>
-          <template v-slot:appEnvironment="{ row }">
-            <Tag
-              v-if="!$utils.isEmpty(row.appEnvironment)"
-              class="cursor-pointer"
-              @click.native="toGlobalAttrManage()"
-            >
-              {{ row.appEnvironment.value }}
-            </Tag>
-          </template>
-          <template v-slot:appSystem="{row}">
-            <!-- 应用系统 -->
-            <div v-if="!$utils.isEmpty(row.appSystem)" class="text-href" @click="toCientityView(row.appSystem)">
-              <span :class="row.appSystem.ciIcon"></span>
-              <span>{{ row.appSystem.name }}</span>
-            </div>
-          </template>
-          <template v-slot:ownerList="{ row }">
-            <div v-if="!$utils.isEmpty(row.ownerList)">
-              <Tag
-                v-for="(o, oindex) in row.ownerList"
-                :key="oindex"
-                class="cursor-pointer"
-                @click.native="toCientityView(o);"
-              >
-                {{ o.name }}
-              </Tag>
-            </div>
-            <div v-else></div>
-          </template>
-          <template v-slot:businessGroupList="{ row }">
-            <div v-if="!$utils.isEmpty(row.businessGroupList)">
-              <Tag
-                v-for="(b, bindex) in row.businessGroupList"
-                :key="bindex"
-                class="cursor-pointer"
-                @click.native="toCientityView(b)"
-              >
-                {{ b.name }}
-              </Tag>
-            </div>
-            <div v-else></div>
-          </template>
-          <template v-slot:state="{row}">
-            <!-- 资产状态 -->
-            <Tag
-              v-if="!$utils.isEmpty(row.state)"
-              class="cursor-pointer"
-              @click.native="toCientityView(row.state)"
-            >
-              {{ row.state.name }}
-            </Tag>
-          </template>
-          <template v-slot:dataCenter="{ row }">
-            <!-- 数据中心 -->
-            <Tag
-              v-if="!$utils.isEmpty(row.dataCenter)"
-              class="cursor-pointer"
-              @click.native="toCientityView(row.dataCenter)"
-            >
-              {{ row.dataCenter.name }}
-            </Tag>
-            <span v-else></span>
-          </template>
-          <template v-slot:ci="{row}">
-            <!-- 模型 -->
-            <div v-if="!$utils.isEmpty(row.ci)" class="text-href" @click="toCiView(row.ci)">
-              <span :class="row.ci.icon"></span>
-              <span>{{ row.ci.label }}</span>
-            </div>
-          </template>
-          <template v-slot:action="{row}">
-            <div class="tstable-action">
-              <ul class="tstable-action-ul">
-                <li v-if="row && row.jobPhaseNodeVo && row.jobPhaseNodeVo.jobId" class="tsfont-history" @click="toJobDetail(row)">{{ $t('term.inspect.jobdetail') }}</li>
-                <li v-auth="'INSPECT_EXECUTE'" class="tsfont-inspection" @click="doInspection(row)">{{ $t('term.inspect.inspect') }}</li>
-                <li class="tsfont-setting" @click="openRuleThresholdDialog(row)">{{ $t('term.inspect.thresholdrule') }}</li>
-              </ul>
-            </div>
-          </template>
-        </TsTable>
-      </div>
-    </div>
-    <NoData v-else></NoData>
-    <InspectionDialog
-      v-if="isShowInspectionDialog"
-      :ciEntityData="currentCiEntity"
-      @close="closeInspectionDialog"
-    ></InspectionDialog>
-    <RuleOfThresholdDialog
-      v-if="isShowRuleThresholdDialog"
-      :appSystemId="appSystemId"
-      :resourceId="resourceId"
-      @close="closeRuleOfThresholdDialog"
-    ></RuleOfThresholdDialog>
-  </div>
-</template>
-<script>
-export default {
-  name: '',
-  components: {
-    UserCard: () => import('@/resources/components/UserCard/UserCard.vue'),
-    TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
-    InspectionDialog: () => import('../assetsInspect/inspection-dialog.vue'), // 单个巡检
-    RuleOfThresholdDialog: () => import('./threshold/rule-of-threshold-dialog.vue'), //阈值规则
-    CommonStatus: () => import('@/resources/components/Status/CommonStatus.vue')
-    
-  },
-  filters: {},
-  props: {
-    appSystemId: {
-      type: Number,
-      default: null
-    },
-    appModuleId: {
-      type: Number,
-      default: null
-    },
-    moduleName: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      loadingShow: false,
-      isShowInspectionDialog: false,
-      isShowRuleThresholdDialog: false,
-      envId: '',
-      resourceId: null,
-      currentCiEntity: null,
-      envList: [],
-      tableList: [],
-      tableData: {
-        tbodyList: [],
-        rowNum: 0,
-        pageSize: 20,
-        currentPage: 1
-      }
-      // theadList: [
-      //   { key: 'ip', title: this.$t('page.ipaddress')},
-      //   { key: 'name', title: this.$t('page.name')},
-      //   { key: 'monitorStatus', title: this.$t('term.inspect.monitoringstate')},
-      //   { key: 'inspectStatus', title: this.$t('term.autoexec.inspectstatus')},
-      //   { key: 'stateName', title: this.$t('term.autoexec.assetstatus')},
-      //   { key: 'envName', title: this.$t('term.inspect.envname')},
-      //   { key: 'clusterName', title: this.$t('term.inspect.clustername')},
-      //   { key: 'dataCenterName', title: this.$t('term.inspect.datacenter')},
-      //   { key: 'networkArea', title: this.$t('page.networkarea')},
-      //   { key: 'ownerList', title: this.$t('page.owner')},
-      //   { key: 'bgList', title: this.$t('term.autoexec.subordinatedepartment')},
-      //   { key: 'maintenanceWindow', title: this.$t('term.deploy.maintenancewindow')},
-      //   { key: 'action'}
-      // ]
-    };
-  },
-  beforeCreate() {},
-  async created() {
-    await this.initData();
-  },
-  beforeMount() {},
-  mounted() {},
-  beforeUpdate() {},
-  updated() {},
-  activated() {},
-  deactivated() {},
-  beforeDestroy() {},
-  destroyed() {},
-  methods: {
-    toJobDetail(row) {
-      // 打开新的作业详情
-      if (row && row.jobPhaseNodeVo) {
-        window.open(HOME + '/inspect.html#/job-detail?id=' + row.jobPhaseNodeVo.jobId + '&status=' + row.jobPhaseNodeVo.status, '_blank');
-       
-        // this.$router.push({path: '/job-detail?id=' + row.jobPhaseNodeVo.jobId + '&status=' + row.jobPhaseNodeVo.status});
-      }
-    },
-    doInspection(row) {
-      // 巡检
-      this.isShowInspectionDialog = true;
-      if (row) {
-        this.currentCiEntity = row;
-      }
-    },
-    closeInspectionDialog() {
-      this.isShowInspectionDialog = false;
-      this.currentCiEntity = null;
-    },
-    restoreHistory(historyData) {
-      this.envId = historyData['envId'];
-    },
-    filterTypeFields(row) {
-      // 过滤类型字段，修复控制台报错问题
-      let currentRow = this.$utils.deepClone(row);
-      if (currentRow && currentRow.hasOwnProperty('type')) {
-        delete currentRow.type;
-      }
-      if (currentRow && currentRow.hasOwnProperty('theadList')) {
-        currentRow.theadList.push({
-          title: '',
-          key: 'action'
-        });
-      }
-      return currentRow;
-    },
-    changeCurrent(currentPage, item, index) {
-      this.tableData.currentPage = currentPage;
-      this.getTableData(item, index);
-    },
-    changePageSize(pageSize, item, index) {
-      this.tableData.pageSize = pageSize;
-      this.tableData.currentPage = 1;
-      this.getTableData(item, index);
-    },
-    async initData() {
-      this.tableData.currentPage = 1;
-      await this.getEnvList();
-      await this.getTableData();
-    },
-    async getEnvList() {
-      this.loadingShow = true;
-      await this.$api.cmdb.applicationManage.getEnvironmenteList().then(res => {
-        if (res.Status == 'OK') {
-          this.envList = res.Return?.tbodyList || [];
-          this.envList.unshift({
-            name: this.$t('term.inspect.allenv'),
-            id: ''
-          });
-          this.envList.push({
-            name: this.$t('term.inspect.noconfigenv'),
-            id: -2
-          });
-          this.envId = this.envId || '';
-        }
-      }).finally(() => {
-        this.loadingShow = false;
-      });
-    },
-    getTableData(row, index) {
-      let currentRow = {};
-      let params = {
-        appSystemId: this.appSystemId,
-        appModuleId: this.appModuleId,
-        envId: this.envId,
-        typeId: row && row.type ? row.type.id : null,
-        currentPage: this.tableData.currentPage,
-        pageSize: this.tableData.pageSize
-      };
-      this.$addHistoryData('envId', this.envId);
-      if (this.$utils.isEmpty(this.appSystemId) && this.$utils.isEmpty(this.appModuleId)) {
-        this.tableList = [];
-        return false;
-      }
-      this.loadingShow = true;
-      this.$api.inspect.applicationInspect.getNewapplicationInspectList(params).then(res => {
-        if (res.Status == 'OK') {
-          if (row && !this.$utils.isEmptyObj(row)) {
-            // 内嵌列表翻页
-            let tableList = (res.Return && res.Return.tableList) ? res.Return.tableList[0] : [];
-            currentRow = Object.assign({}, row, tableList);
-            this.$set(this.tableList, index, currentRow);
-          } else {
-            this.tableList = res.Return.tableList;
-          }
-        }
-      }).finally(() => {
-        this.loadingShow = false;
-      });
-    },
-    toCientityView(row) {
-      // 应用清单详情
-      if (row && !this.$utils.isEmptyObj(row)) {
-        window.open(HOME + '/inspect.html#/ci/' + row.ciId + '/cientity-view/' + row.id, '_blank');
-      
-        // this.$router.push({ path: './ci/' + row.typeId + '/cientity-view/' + row.id });
-      }
-    },
-    toInspectStatusDetail(row) {
-      // 巡检状态详情
-      if (row && !this.$utils.isEmptyObj(row)) {
-        window.open(HOME + '/inspect.html#/assets-detail-' + row.id, '_blank');
-      }
-    },
-    gotoDetails(row) {
-      window.open(HOME + '/inspect.html#/assets-detail-' + row.id, '_blank');
-    },
-    toGlobalAttrManage() {
-      //全局属性管理
-      window.open(HOME + '/cmdb.html#/global-attr-manage', '_blank');
-    },
-    toCiView(ci) {
-      if (ci && !this.$utils.isEmptyObj(ci)) {
-        window.open(HOME + '/cmdb.html#/ci-view/' + ci.id, '_blank');
-      }
-    },
-    selectedEnv(name) {
-      let envId = null;
-      this.envList.forEach(v => {
-        if (v.name == name) {
-          envId = v.id;
-        }
-      });
-      this.envId = envId;
-      this.tableData.currentPage = 1;
-      this.getTableData();
-    },
-    handleTimes(time) {
-      let data = '-';
-      if (time) {
-        data = Date.parse(new Date()) - time;
-      }
-      return data;
-    },
-    openRuleThresholdDialog(row) {
-      if (row && row.id) {
-        this.resourceId = row.id;
-        this.isShowRuleThresholdDialog = true;
-      }
-    },
-    closeRuleOfThresholdDialog() {
-      this.isShowRuleThresholdDialog = false;
-    }
-  },
-  computed: {},
-  watch: {
-    appSystemId() {
-      this.initData();
-    },
-    appModuleId() {
-      this.initData();
-    }
-  }
-};
-</script>
-<style lang="less" scoped>
-.inspection-assets-manage-wrap {
-  .li-box {
-    margin-bottom: -10px;
-  .li-item {
-    padding: 6px 16px;
-    border-radius: 4px;
-    text-align: center;
-    margin-bottom: 10px;
-  }
- }
-}
-
-</style>
diff --git a/src/views/pages/inspect/applicationNew/inspection-schedule-dialog.vue b/src/views/pages/inspect/applicationNew/inspection-schedule-dialog.vue
deleted file mode 100644
index daee0f6b1..000000000
--- a/src/views/pages/inspect/applicationNew/inspection-schedule-dialog.vue
+++ /dev/null
@@ -1,278 +0,0 @@
-<template>
-  <div>
-    <TsDialog v-bind="dialogConfig" @on-close="close">
-      <template v-slot>
-        <div class="editForm input-border">
-          <div>
-            <Row class="mb-md">
-              <Col span="12"></Col>
-              <Col span="12">
-                <InputSearcher v-model="searchParam.keyword" @change="changeKeyword"></InputSearcher>
-              </Col>
-            </Row>
-          </div>
-          <TsTable
-            v-bind="tableData"
-            :theadList="theadList"
-            @changeCurrent="getScheduleList"
-            @changePageSize="changePageSize"
-          >
-            <template v-slot:isActive="{ row }">
-              <span v-if="row.isActive == 1" class="text-success">{{ $t('page.isactived') }}</span>
-              <span v-if="row.isActive == 0" class="text-grey">{{ $t('page.ban') }}</span>
-            </template>
-            <template v-slot:appSystem="{ row }">
-              <span class="text-href" @click="openCronDialog(row)">{{ row.appSystemAbbrName }} ({{ row.appSystemName }})</span>
-            </template>
-            <template v-slot:execCount="{ row }">
-              <span v-if="row.execCount > 0" class="text-href" @click="openJobListDialog(row)">{{ row.execCount }}</span>
-              <span v-else></span>
-            </template>
-            <template v-slot:cron="{ row }">
-              <div>
-                <TsQuartz v-if="row.cron" :value="row.cron" showType="read"></TsQuartz>
-              </div>
-            </template>
-            <template v-slot:lcuVo="{ row }">
-              <span v-if="row.id">
-                <UserCard :initType="row.lcuVo.initType" :uuid="row.lcuVo.uuid" hideAvatar></UserCard>
-              </span>
-              <span v-else></span>
-            </template>
-            <template slot="jobStatus" slot-scope="{ row }">
-              <div v-if="!$utils.isEmpty(row.jobStatus)">
-                <div>
-                  <span class="text-grey">{{ $t('term.inspect.exeount') }}：</span>
-                  <span>{{ row.jobStatus.execCount || '0' }}{{ $t('page.times') }}</span>
-                </div>
-                <div v-if="row.jobStatus.beginTime != null">
-                  <span class="text-grey">{{ $t('term.autoexec.planstarttime') }}：</span>
-                  <span>{{ row.jobStatus.beginTime | formatDate }}</span>
-                </div>
-                <div v-if="row.jobStatus.endTime != null">
-                  <span class="text-grey">{{ $t('term.autoexec.planendtime') }}：</span>
-                  <span>{{ row.jobStatus.endTime | formatDate }}</span>
-                </div>
-                <div v-if="row.jobStatus.lastFireTime != null">
-                  <span class="text-grey">{{ $t('term.autoexec.lastactivetime') }}：</span>
-                  <span>{{ row.jobStatus.lastFireTime | formatDate }}</span>
-                </div>
-                <div v-if="row.jobStatus.lastFinishTime != null">
-                  <span class="text-grey">{{ $t('term.autoexec.lastcompletetime') }}：</span>
-                  <span>{{ row.jobStatus.lastFinishTime | formatDate }}</span>
-                </div>
-                <div v-if="row.jobStatus.nextFireTime != null">
-                  <span class="text-grey">{{ $t('page.nextactivationtime') }}：</span>
-                  <span>{{ row.jobStatus.nextFireTime | formatDate }}</span>
-                </div>
-              </div>
-            </template>
-            <template v-slot:action="{ row }">
-              <div v-if="row.id" class="tstable-action">
-                <ul class="tstable-action-ul">
-                  <li>
-                    <TsFormSwitch
-                      v-model="row.isActive"
-                      :true-value="1"
-                      :false-value="0"
-                      showStatus
-                      :trueText="$t('page.disable')"
-                      :falseText="$t('page.enable')"
-                      @on-change="toggleActive(row)"
-                    ></TsFormSwitch>
-                  </li>
-                  <li
-                    v-if="row.execCount > 0"
-                    class="tsfont-putongjigui"
-                    @click="showAudit(row.id)"
-                  >
-                    <!-- 执行记录 -->
-                    {{ $t('term.autoexec.executionrecord') }}
-                  </li>
-                </ul>
-              </div>
-            </template>
-          </TsTable>
-        </div>
-      </template>
-    </TsDialog>
-    <EditCronDialog
-      v-if="isCronDialogShow"
-      :scheduleData="currentRowData"
-      @close="closeCronDialog"
-    ></EditCronDialog>
-    <JobListDialog
-      v-if="isJobListDialogShow"
-      :id="currentId"
-      @close="closeJobListDialog"
-    ></JobListDialog>
-    <JobAudit v-if="isAuditShow" :jobUuid="currentJobUuid" @close="closeAuditDialog"></JobAudit>
-  </div>
-</template>
-<script>
-export default {
-  name: '',
-  components: {
-    UserCard: () => import('@/resources/components/UserCard/UserCard.vue'),
-    TsQuartz: () => import('@/resources/plugins/TsQuartz/TsQuartz.vue'),
-    TsFormSwitch: () => import('@/resources/plugins/TsForm/TsFormSwitch'),
-    InputSearcher: () => import('@/resources/components/InputSearcher/InputSearcher.vue'),
-    TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
-    EditCronDialog: () => import('./edit-cron-dialog.vue'),
-    JobListDialog: () => import('./job-list-dialog.vue'),
-    JobAudit: () => import('../../framework/schedule/job-audit-dialog.vue')
-  },
-  filters: {},
-  props: {
-    id: Number
-  },
-  data() {
-    return {
-      dialogConfig: {
-        type: 'slider',
-        hasFooter: false,
-        title: this.$t('term.inspect.scheduleinspect'),
-        maskClose: true,
-        isShow: true,
-        width: '80%'
-      },
-      currentId: null,
-      currentJobUuid: null,
-      isAuditShow: false, // 定时任务记录
-      searchParam: {
-        keyword: '',
-        currentPage: 1,
-        pageSize: 20
-      },
-      tableData: {},
-      tbodyList: [],
-      theadList: [
-        {
-          title: this.$t('page.apply'),
-          key: 'appSystem'
-        },
-        {
-          title: this.$t('page.status'),
-          key: 'isActive'
-        },
-        {
-          title: this.$t('term.pbc.timeplan'),
-          key: 'cron',
-          width: 200
-        },
-        {
-          title: this.$t('term.autoexec.executionrecord'),
-          key: 'execCount'
-        },
-        {
-          title: this.$t('page.fcu'),
-          key: 'lcuVo'
-        },
-        {
-          title: this.$t('page.fcd'),
-          key: 'lcd',
-          type: 'time'
-        },
-        { key: 'jobStatus', title: this.$t('term.autoexec.executionsituation') },
-        {
-          key: 'action',
-          title: '',
-          type: 'action'
-        }
-      ],
-      isCronDialogShow: false,
-      isJobListDialogShow: false,
-      currentRowData: null
-    };
-  },
-  beforeCreate() {},
-  async created() {
-    if (this.id) {
-      this.searchParam.defaultValue = [this.id];
-    }
-    await this.getScheduleList(1);
-    if (this.id) {
-      let tbodyList = this.tableData?.tbodyList;
-      if (tbodyList && tbodyList.length > 0) {
-        let row = null;
-        tbodyList.forEach(tbody => {
-          if (tbody.id == this.id) {
-            row = tbody;
-          }
-        });
-        this.openCronDialog(row);
-      }
-    }
-  },
-  beforeMount() {},
-  mounted() {},
-  beforeUpdate() {},
-  updated() {},
-  activated() {},
-  deactivated() {},
-  beforeDestroy() {},
-  destroyed() {},
-  methods: {
-    close(needRefresh) {
-      this.$emit('close', needRefresh);
-    },
-    openCronDialog(row) {
-      this.isCronDialogShow = true;
-      this.currentRowData = row;
-    },
-    closeCronDialog(needRefresh) {
-      this.isCronDialogShow = false;
-      this.currentRowData = null;
-      if (needRefresh) {
-        this.getScheduleList();
-      }
-    },
-    async getScheduleList(currentPage) {
-      if (currentPage) {
-        this.searchParam.currentPage = currentPage;
-      }
-      await this.$api.inspect.applicationInspect.searchSchedule(this.searchParam).then(res => {
-        this.tableData = res.Return;
-      });
-    },
-    changePageSize(pageSize) {
-      this.searchParam.pageSize = pageSize;
-      this.getScheduleList(1);
-    },
-    changeKeyword(keyword) {
-      this.searchParam.keyword = keyword;
-      this.getScheduleList(1);
-    },
-    toggleActive(row) {
-      const param = {
-        id: row.id,
-        isActive: row.isActive
-      };
-      this.$api.inspect.applicationInspect.updateStatus(param).then(res => {
-        if (res.Status == 'OK') {
-          this.$Message.success(this.$t('message.executesuccess'));
-          this.getScheduleList();
-        }
-      });
-    },
-    openJobListDialog(row) {
-      this.currentId = row.id;
-      this.isJobListDialogShow = true;
-    },
-    closeJobListDialog() {
-      this.currentId = null;
-      this.isJobListDialogShow = false;
-    }, showAudit(jobUuid) {
-      this.isAuditShow = true;
-      this.currentJobUuid = '' + jobUuid;
-    },
-    closeAuditDialog() {
-      this.isAuditShow = false;
-      this.currentJobUuid = null;
-    }
-  },
-  computed: {},
-  watch: {}
-};
-</script>
-<style scoped lang="less"></style>
diff --git a/src/views/pages/inspect/applicationNew/job-list-dialog.vue b/src/views/pages/inspect/applicationNew/job-list-dialog.vue
deleted file mode 100644
index aeb22e132..000000000
--- a/src/views/pages/inspect/applicationNew/job-list-dialog.vue
+++ /dev/null
@@ -1,95 +0,0 @@
-<template>
-  <div>
-    <TsDialog v-bind="dialogConfig" @on-close="close">
-      <template v-slot>
-        <div>
-          <Row class="mb-md" :gutter="8">
-            <Col span="8"></Col>
-            <Col span="8">
-              <TsFormDatePicker
-                v-model="dateTimeRange"
-                :placeholder="$t('page.plantime')"
-                format="yyyy-MM-dd HH:mm:ss"
-                type="datetimerange"
-                border="border"
-                @on-change="changeDateTimeRange"
-              ></TsFormDatePicker>
-            </Col>
-            <Col span="8">
-              <InputSearcher v-model="searchParam.keyword"></InputSearcher>
-            </Col>
-          </Row>
-        </div>
-        <div>
-          <JobList :params="searchParam"></JobList>
-        </div>
-      </template>
-    </TsDialog>
-  </div>
-</template>
-<script>
-export default {
-  name: '',
-  components: {
-    TsFormDatePicker: () => import('@/resources/plugins/TsForm/TsFormDatePicker.vue'),
-    InputSearcher: () => import('@/resources/components/InputSearcher/InputSearcher.vue'),
-    JobList: () => import('pages/autoexec/manage/job/job-list.vue')
-  },
-  props: {
-    id: {
-      type: Number
-    }
-  },
-  data() {
-    return {
-      dialogConfig: {
-        type: 'modal',
-        title: this.$t('term.inspect.jobexerecord'),
-        hasFooter: false,
-        maskClose: true,
-        isShow: true,
-        width: 'large'
-      },
-      dateTimeRange: [],
-      searchParam: {
-        scheduleId: this.id,
-        keyword: '',
-        startTime: {},
-        sourceList: ['scheduleinspectapp']
-
-      }
-    };
-  },
-  beforeCreate() {},
-  created() {},
-  beforeMount() {},
-  mounted() {},
-  beforeUpdate() {},
-  updated() {},
-  activated() {},
-  deactivated() {},
-  beforeDestroy() {},
-  destroyed() {},
-  methods: {
-    close() {
-      this.$emit('close');
-    },
-    changeDateTimeRange() {
-      if (this.dateTimeRange instanceof Array) {
-        if (this.dateTimeRange.length > 1) {
-          this.searchParam.startTime = {
-            startTime: this.dateTimeRange[0],
-            endTime: this.dateTimeRange[1]
-          };
-        }
-      } else {
-        this.searchParam.startTime = {};
-      }
-    }
-  },
-  filter: {},
-  computed: {},
-  watch: {}
-};
-</script>
-<style lang="less"></style>
diff --git a/src/views/pages/inspect/applicationNew/latest-questions-manage.vue b/src/views/pages/inspect/applicationNew/latest-questions-manage.vue
deleted file mode 100644
index 7d9d840ad..000000000
--- a/src/views/pages/inspect/applicationNew/latest-questions-manage.vue
+++ /dev/null
@@ -1,719 +0,0 @@
-<template>
-  <div class="latest-question-manage-box padding">
-    <Loading :loadingShow="loadingShow" type="fix"></Loading>
-    <div class="action-group text-right pb-sm">
-      <span :class="isExpandCollapse ? 'tsfont-up' : 'tsfont-down'" class="action-item" @click="handleExpandCollapseAll()">
-        <span v-if="isExpandCollapse">{{ $t('page.packup') }}</span>
-        <span v-else>{{ $t('page.expand') }}</span>
-      </span>
-      <span class="action-item tsfont-rotate-right" @click="handleRefresh()">{{ $t('page.refresh') }}</span>
-      <span v-if="!downloadLoading" v-download="downloadUrl" class="action-item tsfont-download">{{ $t('page.export') }}</span>
-      <span v-if="downloadLoading" class="action-item disable" :title="$t('page.downloadloadingtip')">
-        <Icon type="ios-loading" size="18" class="loading icon-right"></Icon>
-        {{ $t('page.export') }}
-      </span>
-      <span class="action-item tsfont-mail-unread-o" @click="sendEmail">{{ $t('page.mail') }}</span>
-    </div>
-    <div v-if="envList && envList.length > 0" class="li-box">
-      <Row :gutter="16">
-        <Col
-          v-for="item in envList"
-          :key="item.id"
-          :xs="12"
-          :sm="8"
-          :md="6"
-          :lg="4"
-          :xl="3"
-          :xxl="2"
-        >
-          <div
-            v-if="item.name"
-            class="li-item text-action"
-            :class="envId == item.id ? 'li-active li-text border-primary' : 'border-base bg-op'"
-            @click="selectedEnv(item.name)"
-          >{{ item.name }}</div>
-        </Col>
-      </Row>
-    </div>
-    <div v-if="tableList && tableList.length > 0 ">
-      <div v-for="(item, tIndex) in tableList" :key="tIndex">
-        <div class="h3 padding-sm">{{ item.viewLabel }}</div>
-        <div>
-          <TsTable
-            v-if="!loadingShow"
-            v-bind="filterTypeFields(item)"
-            :fixedHeader="false"
-            keyName="id"
-            canExpand
-            class="inner-table"
-            @changeCurrent="(currentPage) => changeCurrent(currentPage, item, tIndex)"
-            @changePageSize="(pageSize) => changePageSize(pageSize, item, tIndex)"
-          >
-            <template v-slot:ip="{ row }">
-              <span class="text-href" @click.stop="toAssetsDetail(row)">
-                <span>{{ row.ip.ip }}</span>
-                <span v-if="row.ip.port">:{{ row.ip.port }}</span>
-              </span>
-            </template>
-            <template v-slot:allIpList="{ row }">
-              <div v-if="!$utils.isEmpty(row.allIpList)">
-                <Tag
-                  v-for="(v, vindex) in row.allIpList"
-                  :key="vindex"
-                  class="cursor-pointer"
-                  @click.native="toCientityView(v)"
-                >
-                  {{ v.name }}
-                </Tag>
-              </div>
-              <div v-else></div>
-            </template>
-            <template v-slot:monitor="{ row }">
-              <!-- 监控状态 -->
-              <span v-if="row.monitor && row.monitor.time" :title="row.monitor.time | formatDate">
-                <span :class="[row.monitor.cssClass, {'background-FATAL': row.monitor.value== 'FATAL'}]" class="vertical">{{ row.monitor.text }} </span>
-                <span class="text-title">
-                  {{ handleTime(row.monitor.time) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
-                </span>
-              </span>
-              <span v-else>
-                <span>-</span>
-              </span>
-            </template>
-            <template v-slot:taskStatus="{ row }">
-              <CommonStatus
-                v-if="row.taskStatus"
-                :statusName="row.taskStatus.text"
-                :statusValue="row.taskStatus.value"
-                type="text"
-              ></CommonStatus>
-              <span v-else>-</span>
-            </template>
-            <template v-slot:inspect="{ row }">
-              <!-- 巡检状态 -->
-              <span v-if="row.inspect && row.inspect.time" :title="row.inspect.time | formatDate">
-                <span :class="[row.inspect.cssClass, {'background-FATAL': row.inspect.value== 'FATAL'}]" class="vertical cursor" @click="toAssetsDetail(row)">{{ row.inspect.text }} </span>
-                <span class="text-title">
-                  {{ handleTime(row.inspect.time) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
-                </span>
-              </span>
-              <span v-else>
-                <span>-</span>
-              </span>
-            </template>
-            <template v-slot:lcu="{row}">
-              <UserCard v-bind="row.lcu" :hideAvatar="true"></UserCard>
-            </template>
-            <template v-slot:lcd="{ row }">
-              <div v-if="row.lcd">{{ row.lcd | formatDate }}</div>
-            </template>
-            <template v-slot:fcu="{ row }">
-              <UserCard v-bind="row.fcu" :hideAvatar="true"></UserCard>
-            </template>
-            <template v-slot:fcd="{ row }">
-              <div v-if="row.fcd">{{ row.fcd | formatDate }}</div>
-            </template>
-            
-            <template v-slot:vendor="{ row }">
-              <!-- 厂商 -->
-              <Tag
-                v-if="!$utils.isEmpty(row.vendor)"
-                class="cursor-pointer"
-                @click.native="toCientityView(row.vendor)"
-              >
-                {{ row.vendor.name }}
-              </Tag>
-              <span v-else></span>
-            </template>
-            <template v-slot:appSystem="{row}">
-              <!-- 应用系统 -->
-              <div v-if="!$utils.isEmpty(row.appSystem)" class="text-href" @click="toCientityView(row.appSystem)">
-                <span :class="row.appSystem.ciIcon"></span>
-                <span>{{ row.appSystem.name }}</span>
-              </div>
-            </template>
-            <template v-slot:appModule="{ row }">
-              <!-- 应用模块 -->
-              <div v-if="!$utils.isEmpty(row.appModule)" class="text-href" @click="toCientityView(row.appModule)">
-                <span :class="row.appModule.ciIcon"></span>
-                <span>{{ row.appModule.name }}</span>
-              </div>
-            </template>
-            <template v-slot:appEnvironment="{ row }">
-              <!-- 环境 -->
-              <Tag
-                v-if="!$utils.isEmpty(row.appEnvironment)"
-                class="cursor-pointer"
-                @click.native="toGlobalAttrManage()"
-              >
-                {{ row.appEnvironment.value }}
-              </Tag>
-            </template>
-            <template v-slot:state="{row}">
-              <!-- 资产状态 -->
-              <Tag
-                v-if="!$utils.isEmpty(row.state)"
-                class="cursor-pointer"
-                @click.native="toCientityView(row.state)"
-              >
-                {{ row.state.name }}
-              </Tag>
-            </template>
-            <template v-slot:ownerList="{ row }">
-              <div v-if="!$utils.isEmpty(row.ownerList)">
-                <Tag
-                  v-for="(o, oindex) in row.ownerList"
-                  :key="oindex"
-                  class="cursor-pointer"
-                  @click.native="toCientityView(o);"
-                >
-                  {{ o.name }}
-                </Tag>
-              </div>
-              <div v-else></div>
-            </template>
-            <template v-slot:businessGroupList="{ row }">
-              <div v-if="!$utils.isEmpty(row.businessGroupList)">
-                <Tag
-                  v-for="(b, bindex) in row.businessGroupList"
-                  :key="bindex"
-                  class="cursor-pointer"
-                  @click.native="toCientityView(b)"
-                >
-                  {{ b.name }}
-                </Tag>
-              </div>
-              <div v-else></div>
-            </template>
-            <template v-slot:ci="{row}">
-              <!-- 模型 -->
-              <div v-if="!$utils.isEmpty(row.ci)" class="text-href" @click="toCiView(row.ci)">
-                <span :class="row.ci.icon"></span>
-                <span>{{ row.ci.label }}</span>
-              </div>
-            </template>
-            <template v-slot:dataCenter="{ row }">
-              <!-- 数据中心 -->
-              <Tag
-                v-if="!$utils.isEmpty(row.dataCenter)"
-                class="cursor-pointer"
-                @click.native="toCientityView(row.dataCenter)"
-              >
-                {{ row.dataCenter.name }}
-              </Tag>
-              <span v-else></span>
-            </template>
-            <template v-slot:expandCollapseArrow="{ row ,index}">
-              <span :class="{ 'tsfont-right': !row._expand, 'tsfont-down open': row._expand }" class="table-icon" @click.stop="openInnerTable(row, tIndex, index)"></span>
-            </template>
-            <template v-slot:expand="{ row }">
-              <ExpandTable v-if="row._expand" style="margin-left: 40px;" :inspectResultList="getInnerTbodyList(row.inspectResult)"></ExpandTable>
-            </template>
-            <template v-slot:action="{ row }">
-              <div class="tstable-action">
-                <ul class="tstable-action-ul">
-                  <li class="tsfont-setting" @click="openRuleThresholdDialog(row)">{{ $t('term.inspect.thresholdrule') }}</li>
-                  <li v-if="row && row.jobPhaseNodeVo && row.jobPhaseNodeVo.jobId" class="tsfont-history" @click="toJobDetail(row)">{{ $t('term.inspect.jobdetail') }}</li>
-                  <li v-if="row.ip" class="tsfont-ci" @click="toCientityView(row.ip)">{{ $t('term.cmdb.viewcientity') }}</li>
-                </ul>
-              </div>
-            </template>
-          </TsTable>
-        </div>
-      </div>
-    </div>
-    <NoData v-else></NoData>
-    <SendEmail
-      v-if="isShowSendEmail"
-      :params="{
-        isNeedAlertDetail: 1,
-        appSystemId: appSystemId,
-        inspectStatusList: inspectStatusList
-      }"
-      @closeSendEmailDialog="closeSendEmailDialog"
-    ></SendEmail>
-    <RuleOfThresholdDialog
-      v-if="isShowRuleThresholdDialog"
-      :appSystemId="appSystemId"
-      :resourceId="resourceId"
-      @close="closeRuleOfThresholdDialog"
-    ></RuleOfThresholdDialog>
-  </div>
-</template>
-<script>
-import download from '@/resources/directives/download.js';
-export default {
-  name: '',
-  components: {
-    UserCard: () => import('@/resources/components/UserCard/UserCard.vue'),
-    TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
-    CommonStatus: () => import('@/resources/components/Status/CommonStatus.vue'),
-    ExpandTable: () => import('@/views/pages/inspect/recentIssues/component/expand-table.vue'),
-    SendEmail: () => import('@/views/pages/inspect/recentIssues/component/send-email.vue'),
-    RuleOfThresholdDialog: () => import('./threshold/rule-of-threshold-dialog.vue')
-  },
-  directives: { download },
-  props: {
-    appSystemId: {
-      // 应用Id
-      type: Number,
-      default: null
-    },
-    appModuleId: {
-      // 模块Id
-      type: Number,
-      default: null
-    }
-  },
-  data() {
-    return {
-      loadingShow: true,
-      isExpandCollapse: true, // 处理展开收起，默认展开
-      isShowSendEmail: false,
-      downloadLoading: false,
-      isShowRuleThresholdDialog: false,
-      typeName: '',
-      envId: null, // 环境ID
-      envList: [], // 环境列表
-      expandCollapseIdList: [], // 展开收起Id列表，下榻页面，返回显示用
-      isBack: false,
-      tableList: [],
-      tableConfig: {
-        tbodyList: [],
-        pageSize: 20,
-        currentPage: 1,
-        rowNum: null
-      }
-      // theadList: [
-      //   {
-      //     title: '',
-      //     key: 'expandCollapseArrow' // 展开收起箭头
-      //   },
-      //   {
-      //     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: this.$t('term.inspect.inspectionjobstatus'),
-      //     key: 'taskStatus'
-      //   },
-      //   {
-      //     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: '',
-      //     key: 'action'
-      //   }
-      // ]
-    };
-  },
-  beforeCreate() {},
-  created() {},
-  beforeMount() {},
-  mounted() {
-    this.initData();
-  },
-  beforeUpdate() {},
-  updated() {},
-  activated() {},
-  deactivated() {},
-  beforeDestroy() {},
-  destroyed() {},
-  methods: {
-    async initData() {
-      this.tableConfig.currentPage = 1;
-      await this.getEnvList();
-      await this.getInspectStatusList();
-      await this.getTableData();
-    },
-    async getEnvList() {
-      await this.$api.cmdb.applicationManage.getEnvironmenteList().then(res => {
-        if (res.Status == 'OK') {
-          this.envList = res.Return?.tbodyList || [];
-          this.envList.unshift({
-            name: this.$t('term.inspect.allenv'),
-            id: ''
-          });
-          this.envList.push({
-            name: this.$t('term.inspect.noconfigenv'),
-            id: -2
-          });
-          this.envId = this.envId || ''; // 有环境id，就取环境ID的值，否则默认选择所有环境（用于下榻页面返回）
-        }
-      });
-    },
-    async getInspectStatusList() {
-      // 获取巡检状态列表
-      this.inspectStatusList = [];
-      await this.$api.common.getSelectList({enumClass: 'InspectStatus'}).then((res) => {
-        if (res.Status == 'OK') {
-          let nodeList = res.Return || [];
-          if (nodeList && nodeList.length > 0) {
-            nodeList.forEach(item => {
-              if (item && item.value != 'normal') {
-                this.inspectStatusList.push(item.value);
-              }
-            });
-          }
-        }
-      });
-    },
-    getTableData(row, index) {
-      //获取表格数据
-      let params = {
-        appSystemId: this.appSystemId,
-        appModuleId: this.appModuleId,
-        envId: this.envId,
-        inspectStatusList: this.inspectStatusList,
-        currentPage: this.tableConfig.currentPage,
-        pageSize: this.tableConfig.pageSize
-      };
-      this.$addHistoryData('isExpandCollapse', this.isExpandCollapse);
-      this.$addHistoryData('expandCollapseIdList', this.expandCollapseIdList);
-      this.$addHistoryData('envId', this.envId);
-      this.loadingShow = true;
-      this.$api.inspect.applicationInspect.getNewapplicationInspectList(params).then(res => {
-        if (res.Status == 'OK') {
-          if (row && !this.$utils.isEmptyObj(row)) {
-            // 内嵌列表翻页
-            let tableList = (res.Return && res.Return.tableList) ? ((res.Return.tableList.length > index) ? res.Return.tableList[index] : res.Return.tableList[0]) : [];
-            let currentRow = Object.assign({}, row, tableList);
-            this.tableConfig.pageSize = tableList ? tableList.pageSize : 20;
-            this.tableConfig.currentPage = tableList ? tableList.currentPage : 1;
-            this.$set(this.tableList, index, currentRow);
-          } else {
-            this.tableList = res.Return ? res.Return.tableList : [];
-            this.tableConfig.pageSize = 20;
-            this.tableConfig.currentPage = 1;
-          }
-          let resourceIdList = [];
-          if (this.tableList && !this.$utils.isEmpty(this.tableList)) {
-            this.tableList.forEach(item => {
-              if (item && item.tbodyList && !this.$utils.isEmpty(item.tbodyList)) {
-                item.tbodyList.forEach((v) => {
-                  if (v && v.id) {
-                    resourceIdList.push(v.id);
-                  }
-                });
-              }
-            });
-          }
-          if (this.$utils.isEmpty(this.expandCollapseIdList) && this.isExpandCollapse) {
-            // 首次需要把id存起来，下榻页面返回需要使用
-            this.expandCollapseIdList = resourceIdList;
-            this.$addHistoryData('expandCollapseIdList', this.expandCollapseIdList);
-          }
-          this.getInnerTableList(resourceIdList); // 获取内嵌表格数据
-        }
-      }).catch(() => {
-        this.loadingShow = false;
-      });
-    },
-    getInnerTableList(resourceIdList) {
-      // 获取内嵌表格数据
-      this.loadingShow = true;
-      if (resourceIdList && !this.$utils.isEmpty(resourceIdList)) {
-        this.$api.inspect.inspectJob.getRecentIssuesInnerTableList({ resourceIdList: resourceIdList }).then(res => {
-          if (res.Status == 'OK') {
-            let obj = res.Return;
-            this.tableList.forEach(item => {
-              if (item && item.tbodyList && !this.$utils.isEmpty(item.tbodyList)) {
-                item.tbodyList.forEach((v) => {
-                  Object.keys(obj).forEach(n => {
-                    if (v.id == n) {
-                      this.$set(v, 'inspectResult', obj[n] ? Object.values(obj[n]) : []);
-                    }
-                  });
-                });
-              }
-            });
-            if (this.tableList && !this.$utils.isEmpty(this.tableList)) {
-              this.tableList.forEach(val => {
-                if (val && val.tbodyList && !this.$utils.isEmpty(val.tbodyList)) {
-                  val.tbodyList.forEach((v) => {
-                    if (v && v.hasOwnProperty('inspectResult') && !this.$utils.isEmpty(v.inspectResult)) {
-                      if (this.isBack) { // 下榻页面返回，恢复之前展开收起状态
-                        v['_expand'] = !this.$utils.isEmpty(this.expandCollapseIdList) ? this.expandCollapseIdList.includes(v.id) : this.isExpandCollapse;
-                      } else {
-                        v['_expand'] = this.isExpandCollapse;
-                      }
-                    }
-                  });
-                }
-              });
-            }
-          }
-        }).finally(() => {
-          this.loadingShow = false;
-        });
-      } else {
-        this.loadingShow = false;
-      }
-    },
-    changeCurrent(currentPage, item, index) {
-      this.tableConfig.currentPage = currentPage;
-      this.getTableData(item, index);
-    },
-    changePageSize(pageSize, item, index) {
-      this.tableConfig.pageSize = pageSize;
-      this.tableConfig.currentPage = 1;
-      this.getTableData(item, index);
-    },
-    restoreHistory(historyData) {
-      // 下榻页面，返回搜索条件保持一致
-      this.isBack = true;
-      this.envId = historyData['envId'];
-      this.expandCollapseIdList = historyData['expandCollapseIdList'];
-      this.isExpandCollapse = historyData['isExpandCollapse'];
-    },
-    selectedEnv(name) {
-      let envId = null;
-      this.envList.forEach(v => {
-        if (v.name == name) {
-          envId = v.id;
-        }
-      });
-      this.envId = envId;
-      this.tableConfig.currentPage = 1;
-      this.getTableData();
-    },
-    filterTypeFields(row) {
-      // 过滤类型字段，修复控制台报错问题
-      let currentRow = this.$utils.deepClone(row);
-      if (currentRow && currentRow.hasOwnProperty('type')) {
-        delete currentRow.type;
-      }
-      if (currentRow && currentRow.hasOwnProperty('theadList')) {
-        currentRow.theadList.unshift({
-          title: '',
-          key: 'expandCollapseArrow' // 展开收起箭头
-        });
-        currentRow.theadList.push({
-          title: '',
-          key: 'action'
-        });
-      }
-      return currentRow;
-    },
-    handleTime(time) {
-      let data = '-';
-      if (time) {
-        data = Date.parse(new Date()) - time;
-      }
-      return data;
-    },
-    handleExpandCollapseAll() {
-      // 处理展开收起所有(内嵌表格)
-      this.isExpandCollapse = !this.isExpandCollapse;
-      let expandCollapseIdList = [];
-      if (this.tableList && !this.$utils.isEmpty(this.tableList)) {
-        this.tableList.forEach(item => {
-          if (item && item.tbodyList && !this.$utils.isEmpty(item.tbodyList)) {
-            item.tbodyList.forEach((v) => {
-              v['_expand'] = this.isExpandCollapse;
-              if (this.isExpandCollapse) {
-                // 展开，需要存储展开的id
-                expandCollapseIdList.push(v.id);
-              } else {
-                expandCollapseIdList = [];
-              }
-            });
-          }
-        });
-      }
-      this.expandCollapseIdList = expandCollapseIdList;
-      this.$addHistoryData('isExpandCollapse', this.isExpandCollapse);
-      this.$addHistoryData('expandCollapseIdList', expandCollapseIdList);
-    },
-    openInnerTable(row, tIndex, rowIndex) {
-      // 展开收起内嵌表格
-      if (row['_expand']) {
-        row._expand = false;
-        this.$set(this.tableList[tIndex]['tbodyList'], rowIndex, row);
-        this.isExpandCollapse = false;
-        this.expandCollapseIdList && this.expandCollapseIdList.forEach((id, index) => {
-          if (id == row.id) {
-            this.expandCollapseIdList.splice(index, 1);
-          }
-        });
-      } else {
-        row._expand = true;
-        this.$set(this.tableList[tIndex]['tbodyList'], rowIndex, row);
-        this.isExpandCollapse = true;
-        if (!this.expandCollapseIdList.includes(row.id)) {
-          // id没有时，才push进去
-          this.expandCollapseIdList.push(row.id);
-        }
-      }
-      this.$addHistoryData('expandCollapseIdList', this.expandCollapseIdList);
-      this.$addHistoryData('isExpandCollapse', this.isExpandCollapse);
-    },
-    getInnerTbodyList(inspectResult) {
-      // 处理内嵌表格数据
-      let tbodyList = [];
-      if (inspectResult && !this.$utils.isEmpty(inspectResult)) {
-        tbodyList = inspectResult;
-      }
-      return tbodyList;
-    },
-    handleRefresh() {
-      // 处理刷新
-      this.tableConfig.currentPage = 1;
-      this.getTableData();
-    },
-    sendEmail() {
-      // 发送邮件
-      this.isShowSendEmail = true;
-    },
-    closeSendEmailDialog() {
-      this.isShowSendEmail = false;
-    },
-    toAssetsDetail(row) {
-      // 跳转巡检报告页面
-      window.open(HOME + '/inspect.html#/assets-detail-' + row.id, '_blank');
-    },
-    toJobDetail(row) {
-      // 工作详情
-      if (row && row.jobPhaseNodeVo) {
-        window.open(HOME + '/inspect.html#/job-detail?id=' + row.jobPhaseNodeVo.jobId + '&status=' + row.jobPhaseNodeVo.status, '_blank');
-       
-        // this.$router.push({path: '/job-detail?id=' + row.jobPhaseNodeVo.jobId + '&status=' + row.jobPhaseNodeVo.status});
-      }
-    },
-    toCientityView(row) {
-      // 跳转查看配置项页面
-      if (row && !this.$utils.isEmptyObj(row)) {
-        window.open(HOME + '/inspect.html#/ci/' + row.ciId + '/cientity-view/' + row.id, '_blank');
-      }
-      // this.$router.push({path: '/ci/' + row.typeId + '/cientity-view/' + row.id});
-    },
-    toCiView(ci) {
-      if (ci && !this.$utils.isEmptyObj(ci)) {
-        window.open(HOME + '/cmdb.html#/ci-view/' + ci.id, '_blank');
-      }
-    },
-    openRuleThresholdDialog(row) {
-      if (row && row.id) {
-        this.resourceId = row.id;
-        this.isShowRuleThresholdDialog = true;
-      }
-    },
-    closeRuleOfThresholdDialog() {
-      this.isShowRuleThresholdDialog = false;
-    }
-  },
-  filter: {},
-  computed: {
-    downloadUrl() {
-      return {
-        url: 'api/binary/inspect/new/problem/report/export',
-        method: 'post',
-        params: {
-          isNeedAlertDetail: 1,
-          appSystemId: this.appSystemId,
-          inspectStatusList: this.inspectStatusList
-        },
-        changeStatus: status => {
-          if (status == 'start') {
-            this.downloadLoading = true;
-          } else if (status == 'success' || status == 'error') {
-            this.downloadLoading = false;
-          }
-        }
-      };
-    }
-  },
-  watch: {
-    appModuleId(id) {
-      if (id) {
-        this.expandCollapseIdList = [];
-        this.isExpandCollapse = true;
-        this.isBack = false;
-        this.initData();
-      }
-    },
-    appSystemId(id) {
-      if (id && this.$utils.isEmpty(this.appModuleId)) {
-        this.expandCollapseIdList = [];
-        this.isExpandCollapse = true;
-        this.isBack = false;
-        this.initData();
-      }
-    }
-  }
-};
-</script>
-<style lang="less" scoped>
-.latest-question-manage-box {
-  .li-box {
-    margin-bottom: -10px;
-  .li-item {
-    padding: 6px 16px;
-    border-radius: 4px;
-    text-align: center;
-    margin-bottom: 10px;
-  }
- }
- .table-icon {
-  cursor: pointer;
-  font-size: 14px;
-  visibility: hidden;
-  padding: 1px 3px;
-  &.open {
-    visibility: visible;
-  }
-}
-tr:hover {
-  .table-icon {
-    visibility: visible;
-  }
- }
-}
-</style>
diff --git a/src/views/pages/inspect/applicationNew/threshold/app-threshold-rule-add.vue b/src/views/pages/inspect/applicationNew/threshold/app-threshold-rule-add.vue
deleted file mode 100644
index 016f1b71e..000000000
--- a/src/views/pages/inspect/applicationNew/threshold/app-threshold-rule-add.vue
+++ /dev/null
@@ -1,485 +0,0 @@
-
-<template>
-  <div class="rule-add-wrap" :style="$utils.isEmpty(ruleList) ? 'margin-top: 2px;' : ''">
-    <ul v-if="!$utils.isEmpty(ruleList)" class="mb-md">
-      <li
-        v-for="(item, index) in ruleList"
-        :id="`to_${item.ruleId}`"
-        :key="item.ruleUuid"
-        class="bg-op radius-lg padding mb-md"
-      >
-        <div class="header-wrapper" :class="item.isShow ? 'pb-sm header-border-bottom border-color' : ''">
-          <span>#{{ item.ruleId }}</span>
-          <div class="action-group">
-            <span
-              v-if="$AuthUtils.hasRole('INSPECT_MODIFY')"
-              class="tsfont-copy text-action action-item"
-              :title="$t('page.copy')"
-              @click="copyRow(item,index)"
-            ></span>
-            <span
-              class="text-action action-item"
-              :class="[item.isShow == true ? 'tsfont-down' : 'tsfont-up']"
-              :title="[item.isShow == true ? $t('page.packup') : $t('page.expand')]"
-              @click="expandCollapse(item, index)"
-            ></span>
-            <span
-              v-if="item.flag == 'app' && $AuthUtils.hasRole('INSPECT_MODIFY')"
-              class="tsfont-close text-action action-item"
-              :title="$t('page.delete')"
-              @click="delRow(item,index)"
-            ></span>
-          </div>
-        </div>
-        <div :class="[item.isShow == true ? 'show-li' : 'hide-li']" class="pt-nm">
-          <TsForm
-            ref="formSetting"
-            v-model="item.formValue"
-            :itemList="item.formSetting"
-            labelPosition="left"
-            :labelWidth="70"
-          ></TsForm>
-        </div>
-      </li>
-    </ul>
-    <Button
-      v-if="$AuthUtils.hasRole('INSPECT_MODIFY')"
-      type="primary"
-      ghost
-      @click.native="addRule"
-    >
-      <span class="text-href tsfont-plus add-text">
-        {{ $t('term.inspect.addrule') }}
-      </span>
-    </Button>
-  </div>
-</template>
-<script>
-export default {
-  name: '',
-  components: {
-    TsForm: () => import('@/resources/plugins/TsForm/TsForm')
-  },
-  filters: {},
-  props: {
-    // 规则
-    thresholdsData: {
-      type: Object,
-      default: () => ({})
-    }
-  },
-  data() {
-    return {
-      initDataList: [], // 初始值
-      ruleList: [],
-      levelList: [], // 级别下拉数组
-      ruleTooltips: this.$t('term.inspect.ruletooltips')
-    };
-  },
-  beforeCreate() {},
-  created() {
-    this.filterNormalFields(); // 过滤级别正常的字段
-    this.initData();
-  },
-  beforeMount() {},
-  mounted() {},
-  beforeUpdate() {},
-  updated() {},
-  activated() {},
-  deactivated() {},
-  beforeDestroy() {},
-  destroyed() {},
-  methods: {
-    initData() {
-      this.initDataList = [];
-      this.ruleList = [];
-      if (!this.$utils.isEmptyObj(this.thresholdsData) && (!this.$utils.isEmpty(this.thresholdsData.globalThresholds) || !this.$utils.isEmpty(this.thresholdsData.appThresholds))) {
-      // 规则回显问题
-        let thresholdsList = [];
-        let appIndex = 0;
-        let hasAuth = this.$AuthUtils.hasRole('INSPECT_MODIFY');
-        this.thresholdsData && this.thresholdsData.globalThresholds && this.thresholdsData.globalThresholds.length > 0 && this.thresholdsData.globalThresholds.forEach((v, index) => {
-          if (v) {
-            thresholdsList.push({...v, inheritGlobal: 1, flag: 'global', ruleId: (index + 1)});
-          }
-        });
-        this.thresholdsData && this.thresholdsData.appThresholds && this.thresholdsData.appThresholds.length > 0 && this.thresholdsData.appThresholds.forEach((v, index) => {
-          let hasRepeatRuleUuid = thresholdsList.find((u) => u.ruleUuid == v.ruleUuid);
-          if (hasRepeatRuleUuid) {
-          // 应用层，取消继承全局，那么应用层的id和全局阈值规则相同，那么应用层的阈值规则，覆盖全局阈值规则
-            hasRepeatRuleUuid = Object.assign(hasRepeatRuleUuid, {name: v.name, level: v.level, rule: v.rule, inheritGlobal: 0});
-          } else if (v) {
-            appIndex++;
-            thresholdsList.push({...v, inheritGlobal: 0, flag: 'app', ruleId: v && v.ruleUuid ? (appIndex + 5000) : 5001});
-          }
-        });
-        thresholdsList.forEach((v) => {
-          let ruleUuid = v && v.ruleUuid ? v.ruleUuid : this.$utils.setUuid();
-          this.ruleList.push({
-            ruleUuid: ruleUuid,
-            ruleId: v.ruleId,
-            flag: v.flag, // 标识
-            formSetting: [
-              {
-                name: 'inheritGlobal',
-                label: this.$t('term.inspect.inheritglobal'),
-                type: 'switch',
-                value: 1,
-                falseValue: 0,
-                trueValue: 1,
-                readonly: !hasAuth,
-                isHidden: v.flag != 'global', // 继承全局才会显示按钮
-                onChange: (val) => {
-                  if (val == 0) {
-                    this.ruleList.forEach((item) => {
-                      if (item.ruleUuid == ruleUuid) {
-                        this.$set(v, 'inheritGlobal', val);
-                        item.formSetting.forEach((itemV) => {
-                          if (itemV.name != 'inheritGlobal') {
-                            itemV.disabled = false;
-                          }
-                        });
-                      }
-                    });
-                  } else if (val == 1) {
-                  // 继承全局
-                    this.ruleList.forEach((item) => {
-                      if (item.ruleUuid == ruleUuid) {
-                        this.$set(v, 'inheritGlobal', val);
-                        this.$set(item, 'formValue', item.defaultFormValue);
-                        this.$set(item.formValue, 'inheritGlobal', val);
-                        item.formSetting.forEach((itemV) => {
-                          if (itemV.name != 'inheritGlobal') {
-                            itemV.disabled = true;
-                          }
-                        });
-                      }
-                    });
-                  }
-                }
-              },
-              {
-                name: 'name',
-                label: this.$t('page.name'),
-                type: 'text',
-                maxlength: 50,
-                value: '',
-                readonly: !hasAuth,
-                disabled: !!(v.flag == 'global' && v.inheritGlobal), // 继承全局，不可编辑
-                validateList: [
-                  'required',
-                  {
-                    name: 'custom', trigger: 'change', message: this.$t('message.cannotrepeat', {target: this.$t('page.name')}), validator: (rule, value) => {
-                      return this.validNameUnique(value);
-                    }}
-                ]
-              },
-              {
-                name: 'level',
-                label: this.$t('page.level'),
-                type: 'select',
-                readonly: !hasAuth,
-                dataList: this.levelList,
-                disabled: !!(v.flag == 'global' && v.inheritGlobal), // 继承全局，不可编辑
-                validateList: ['required']
-              },
-              {
-                name: 'rule',
-                label: this.$t('page.rule'),
-                type: 'textarea',
-                readonly: !hasAuth,
-                tooltip: this.ruleTooltips,
-                maxlength: 1000,
-                disabled: !!((v.flag == 'global' && v.inheritGlobal)), // 继承全局，不可编辑
-                validateList: ['required']
-              }
-            ],
-            formValue: {
-              name: v.name,
-              level: v.level,
-              rule: v.rule,
-              inheritGlobal: v.inheritGlobal
-            },
-            isShow: true
-          });
-          if (v && ((v.flag == 'global' && v.inheritGlobal == 0) || v.flag == 'app')) {
-            this.initDataList.push({
-              ruleUuid: ruleUuid,
-              name: v.name,
-              level: v.level,
-              rule: v.rule,
-              isOverWrite: v.flag == 'global' && v.inheritGlobal == 0 ? 1 : 0
-            });
-          }
-        });
-        this.ruleList && this.ruleList.forEach((v) => {
-          let hasRuleUuid = this.thresholdsData.globalThresholds.find((item) => item.ruleUuid == v.ruleUuid);
-          if (v && v.flag == 'global' && hasRuleUuid) {
-          // 存储一份全局阈值规则，用于取消继承全局后，拿到全局阈值规则的值
-            v.defaultFormValue = {
-              ...hasRuleUuid
-            };
-          }
-        });
-      } else {
-        this.addRule();
-        this.initDataList.push({
-          name: '',
-          level: '',
-          rule: ''
-        });
-      }
-    },
-    valid() {
-      let formList = this.$refs.formSetting;
-      let isValidPass = true;
-      if (formList) {
-        for (let j = 0; j < formList.length; j++) {
-          if (!formList[j].valid()) {
-            isValidPass = false;
-          }
-        }
-      } else {
-        isValidPass = false;
-      }
-      return isValidPass;
-    },
-    validNameUnique(name) {
-      // 根据名称验证唯一性
-      let repeatNameList = [];
-      let isValidPass = true;
-      if (!this.$utils.isEmpty(this.ruleList)) {
-        repeatNameList = this.ruleList.filter((v) => {
-          // 过滤当前输入的值
-          return v.formValue.name == name && (v.formValue.inheritGlobal != 1);
-        });
-        if (!this.$utils.isEmpty(repeatNameList) && repeatNameList.length >= 2) {
-          isValidPass = false;
-        } else {
-          isValidPass = true;
-        }
-      }
-      return isValidPass;
-    },
-    getGlobalMaxRuleId() {
-      // 获取最大值的规则id
-      let ruleIdList = [];
-      let maxRuleId = null;
-      this.ruleList && this.ruleList.forEach((v) => {
-        if (v && v.flag == 'app' && v.ruleId) {
-          ruleIdList.push(v.ruleId);
-        }
-      });
-      maxRuleId = Math.max.apply(null, ruleIdList);
-      return (maxRuleId != -Infinity || isNaN(maxRuleId)) ? (maxRuleId + 1) : 1;
-    },
-    getFormValue() {
-      // 提供给外部使用
-      let saveFormValue = {isOverWrite: 0, thresholds: []};
-      if (!this.$utils.isEmpty(this.ruleList)) {
-        this.ruleList.forEach((v) => {
-          if (v && v.flag == 'global' && v.formValue.inheritGlobal == 0) {
-            saveFormValue.thresholds.push({
-              ruleUuid: v.ruleUuid,
-              name: v.formValue.name,
-              rule: v.formValue.rule,
-              level: v.formValue.level,
-              isOverWrite: v.formValue.inheritGlobal == 0 ? 1 : 0
-            });
-          } else if (v && v.flag == 'app') {
-            saveFormValue.thresholds.push({
-              ruleUuid: v.ruleUuid,
-              name: v.formValue.name,
-              rule: v.formValue.rule,
-              level: v.formValue.level,
-              isOverWrite: 0
-            });
-          }
-        });
-        let hasOverwrite = saveFormValue.thresholds.find(v => v.isOverWrite == 1);
-        if (hasOverwrite) {
-          saveFormValue.isOverWrite = 1;
-        } else {
-          saveFormValue.isOverWrite = 0;
-        }
-      }
-      return saveFormValue;
-    },
-    getInitData() {
-      return this.initDataList;
-    },
-    addRule() {
-      // 添加规则
-      let hasAuth = this.$AuthUtils.hasRole('INSPECT_MODIFY');
-      this.ruleList.push(
-        {
-          ruleUuid: this.$utils.setUuid(),
-          ruleId: this.getGlobalMaxRuleId(),
-          flag: 'app', // 标识
-          formSetting: [
-            {
-              name: 'name',
-              label: this.$t('page.name'),
-              type: 'text',
-              maxlength: 50,
-              readonly: !hasAuth,
-              validateList: [
-                'required',
-                {
-                  name: 'custom', trigger: 'change', message: this.$t('message.cannotrepeat', {target: this.$t('page.name')}), validator: (rule, value) => {
-                    return this.validNameUnique(value);
-                  }}
-              ]
-            },
-            {
-              name: 'level',
-              label: this.$t('page.level'),
-              type: 'select',
-              readonly: !hasAuth,
-              dataList: this.levelList,
-              validateList: ['required']
-            },
-            {
-              name: 'rule',
-              label: this.$t('page.rule'),
-              type: 'textarea',
-              readonly: !hasAuth,
-              tooltip: this.ruleTooltips,
-              maxlength: 1000,
-              validateList: ['required']
-            }
-          ],
-          formValue: {
-            name: '',
-            level: '',
-            rule: ''
-          },
-          isShow: true
-        }
-      );
-    },
-    delRow(row, index) {
-      if (row && row.formValue) {
-        this.$createDialog({
-          title: this.$t('dialog.title.deleteconfirm'),
-          content: this.$t('dialog.content.deleteconfirm', {target: row.formValue && row.formValue.name ? row.formValue.name : ''}),
-          btnType: 'error',
-          'on-ok': vnode => {
-            this.ruleList.splice(index, 1);
-            this.$Message.success(this.$t('message.deletesuccess'));
-            vnode.isShow = false;
-          }
-        });
-      }
-    },
-    copyRow(item) {
-      let currentRow = this.$utils.deepClone(item);
-      Object.assign(currentRow, {
-        ruleUuid: this.$utils.setUuid(),
-        ruleId: this.getGlobalMaxRuleId(),
-        flag: 'app',
-        formSetting: [
-          {
-            name: 'name',
-            label: this.$t('page.name'),
-            type: 'text',
-            maxlength: 50,
-            validateList: [
-              'required',
-              {
-                name: 'custom', trigger: 'change', message: this.$t('message.cannotrepeat', {target: this.$t('page.name')}), validator: (rule, value) => {
-                  return this.validNameUnique(value);
-                }}
-            ]
-          },
-          {
-            name: 'level',
-            label: this.$t('page.level'),
-            type: 'select',
-            dataList: this.levelList,
-            validateList: ['required']
-          },
-          {
-            name: 'rule',
-            label: this.$t('page.rule'),
-            type: 'textarea',
-            tooltip: this.ruleTooltips,
-            maxlength: 1000,
-            validateList: ['required']
-          }
-        ]
-      });
-      if (currentRow && currentRow.formValue && currentRow.formValue.inheritGlobal) {
-        delete currentRow.formValue.inheritGlobal;
-      }
-      this.ruleList.push(currentRow);
-    },
-    filterNormalFields() {
-      // 过滤级别正常的字段
-      this.$api.common.getSelectList({enumClass: 'neatlogic.framework.common.constvalue.InspectStatus'}).then((res) => {
-        if (res.Status == 'OK' && res.Return) {
-          let levelList = res.Return;
-          for (let i = 0; i < levelList.length; i++) {
-            // 过滤级别"normal"字段，value值转成大写
-            levelList[i].value = levelList[i].value.toUpperCase();
-            if (levelList[i].value != 'NORMAL') {
-              this.levelList.push({
-                ...levelList[i]
-              });
-            }
-          }
-          if (!this.$utils.isEmpty(this.levelList)) {
-            this.ruleList.forEach((v) => {
-              if (v && v.formSetting) {
-                v.formSetting.forEach((itemV) => {
-                  if (itemV.name == 'level') {
-                    this.$set(itemV, 'dataList', this.levelList);
-                    v.formValue.level = v.formValue.level ? v.formValue.level.toUpperCase() : '';
-                  }
-                });
-              }
-            });
-          }
-        }
-      });
-    },
-    expandCollapse(item) {
-      if (item.isShow == false) {
-        this.$set(item, 'isShow', true);
-      } else {
-        this.$set(item, 'isShow', false);
-      }
-    },
-    jumpTo(id) {
-      this.$utils.jumpTo(id);
-    }
-  },
-  computed: {},
-  watch: {
-    thresholdsData: {
-      handler() {
-        this.initData();
-      },
-      deep: true
-    }
-  }
-};
-</script>
-
-<style lang="less" scoped>
-.rule-add-wrap {
-  .show-li {
-    display: block;
-  }
-  .hide-li {
-    display: none;
-  }
-  .header-wrapper {
-    display: flex;
-    justify-content: space-between;
-  }
-  .header-border-bottom {
-    border-bottom: 1px solid;
-  }
-}
-</style>
diff --git a/src/views/pages/inspect/applicationNew/threshold/copy-rule-dialog.vue b/src/views/pages/inspect/applicationNew/threshold/copy-rule-dialog.vue
deleted file mode 100644
index 8c1cc2a28..000000000
--- a/src/views/pages/inspect/applicationNew/threshold/copy-rule-dialog.vue
+++ /dev/null
@@ -1,145 +0,0 @@
-<template>
-  <div>
-    <TsDialog
-      :title="$t('dialog.title.copytarget', {target: $t('term.inspect.thresholdrule')})"
-      type="slider"
-      width="large"
-      :okText="$t('page.confirm')"
-      :isShow="true"
-      @on-close="closeDialog"
-      @on-ok="okDialog"
-    >
-      <template v-slot>
-        <div>
-          <Loading
-            :loadingShow="loadingShow"
-            type="fix"
-          ></Loading>
-          <TsRow :gutter="10">
-            <Col span="24">
-              <Alert show-icon>{{ $t('term.inspect.thressholdrulealert') }}</Alert>
-            </Col>
-          </TsRow>
-          <TsRow :gutter="10">
-            <Col span="14">
-            </Col>
-            <Col span="10">
-              <InputSearcher
-                v-model="keyword"
-                :placeholder="$t('page.appname')+$t('term.deploy.abbreviation')"
-                style="margin-right: 12px;"
-                @change="() => getDataList(1)"
-              ></InputSearcher>
-            </Col>
-          </TsRow>
-          <div v-if="!loadingShow" class="content-wrap">
-            <TsCard
-              v-model="selectedRuleIdList"
-              v-bind="cardData"
-              :bodyStyle="{padding: '14px 22px', minHeight: '75px'}"
-              :sm="8"
-              :lg="8"
-              :xl="8"
-              :xxl="8"
-              :boxShadow="false"
-              @updatePage="getDataList"
-              @getSelected="getSelected"
-            >
-              <template slot-scope="{ row }">
-                <div class="cursor">
-                  <div class="overflow" :title="row.abbrName">{{ row.abbrName }}</div>
-                  <div class="text-grey overflow pt-xs" :title="row.name">{{ row.name || '-' }}</div>
-                </div>
-              </template>
-            </TsCard>
-          </div>
-        </div>
-      </template>
-    </TsDialog>
-  </div>
-</template>
-<script>
-export default {
-  name: '', // 选择组合工具弹窗入口
-  components: {
-    TsCard: () => import('@/resources/components/TsCard/TsCard.vue'),
-    InputSearcher: () => import('@/resources/components/InputSearcher/InputSearcher.vue')
-  },
-  props: {
-    copyRuleData: {
-      type: Object,
-      default: function() {
-        return {};
-      }
-    }
-  },
-  data() {
-    return {
-      loadingShow: true,
-      keyword: '',
-      selectedIdList: [],
-      selectedRuleIdList: [],
-      cardData: {
-        canSelect: true,
-        keyName: 'id',
-        currentPage: 1,
-        pageSize: 21,
-        pageCount: 1
-      }
-    };
-  },
-  beforeCreate() {},
-  created() {
-    this.getDataList();
-  },
-  beforeMount() {},
-  mounted() {},
-  beforeUpdate() {},
-  updated() {},
-  activated() {},
-  deactivated() {},
-  beforeDestroy() {},
-  destroyed() {},
-  methods: {
-    closeDialog() {
-      this.$emit('close');
-    },
-    getDataList(currentPage = 1) {
-      let params = {
-        keyword: this.keyword,
-        currentPage: currentPage || this.cardData.currentPage,
-        pageSize: this.cardData.pageSize
-      };
-      this.loadingShow = true;
-      this.$api.cmdb.applicationManage.getAppsystemListTree(params).then(res => {
-        if (res && res.Status == 'OK') {
-          Object.assign(this.cardData, res.Return);
-        }
-      }).finally(() => {
-        this.loadingShow = false;
-      });
-    },
-    okDialog() {
-      if (this.$utils.isEmpty(this.selectedIdList)) {
-        this.$Message.warning(this.$t('term.inspect.selectapp'));
-        return false;
-      } else {
-        this.$api.inspect.definition.copyCollectionThreshold({...this.copyRuleData, targetAppSystemIdList: this.selectedIdList}).then(res => {
-          if (res && res.Status == 'OK') {
-            this.$Message.success(this.$t('message.savesuccess'));
-            this.closeDialog();
-          }
-        });
-      }
-    },
-    getSelected(val, items) {
-      this.selectedIdList = val;
-    }
-  },
-  filter: {},
-  computed: {},
-  watch: {}
-};
-</script>
-<style lang="less" scoped>
-</style>
diff --git a/src/views/pages/inspect/applicationNew/threshold/rule-of-threshold-detail.vue b/src/views/pages/inspect/applicationNew/threshold/rule-of-threshold-detail.vue
deleted file mode 100644
index c6ca1a8a6..000000000
--- a/src/views/pages/inspect/applicationNew/threshold/rule-of-threshold-detail.vue
+++ /dev/null
@@ -1,173 +0,0 @@
-
-<template>
-  <div>
-    <Loading :loadingShow="loadingShow" type="fix"></Loading>
-    <TsContain :siderWidth="450">
-      <template v-slot:navigation>
-        <span v-if="$hasBack()" class="tsfont-left text-action" @click="$back()">{{ $getFromPage() }}</span>
-      </template>
-      <template v-slot:topLeft>
-        <div class="action-group">
-          <span v-if="appSystemCollectionName" class="action-item">{{ appSystemCollectionName }}</span>
-          <span v-if="headerObj && headerObj.userVo" class="action-item text-grey">{{ headerObj.userVo.name }}</span>
-          <span v-if="headerObj && headerObj.lcd" class="action-item text-grey">{{ headerObj.lcd | formatDate }}</span>
-        </div>
-      </template>
-      <template v-slot:topRight>
-        <div class="action-group">
-          <span v-if="$AuthUtils.hasRole('INSPECT_MODIFY')" class="tsfont-copy action-item" @click="copyRuleOfThreshold">{{ $t('dialog.title.copytarget', {target: $t('page.rule')}) }}</span>
-          <span v-if="$AuthUtils.hasRole('INSPECT_MODIFY')" class="action-item"><Button type="primary" @click="saveThresholdRule">{{ $t('page.save') }}</Button></span>
-        </div>
-      </template>
-      <template v-slot:sider>
-        <div style="width: 434px;">
-          <!-- 数据结构 -->
-          <JsonViewer
-            id="json-viewer-wrap"
-            :expanded="true"
-            style="height: calc(100vh - 120px);overflow: auto;"
-            class="radius-lg bg-grey"
-            :expand-depth="5"
-            :value="fields"
-          ></JsonViewer>
-        </div>
-      </template>
-      <template v-slot:content>
-        <div>
-          <AppThresholdRuleAdd v-show="!loadingShow" ref="ruleAdd" :thresholdsData="thresholds"></AppThresholdRuleAdd>
-        </div>
-      </template>
-    </TsContain>
-    <CopyRuleDialog v-if="isShowCopyRuleDialog" :copyRuleData="{name: inspectName, appSystemId: appSystemId}" @close="closeCopyRuleDialog"></CopyRuleDialog>
-  </div>
-</template>
-<script>
-export default {
-  name: '', // 阈值规则详情
-  components: {
-    JsonViewer: () => import('vue-json-viewer'),
-    AppThresholdRuleAdd: () => import('./app-threshold-rule-add.vue'), // 添加规则
-    CopyRuleDialog: () => import('./copy-rule-dialog')
-  },
-  filters: {},
-  props: {},
-  data() {
-    return {
-      thresholds: {},
-      fields: {}, // 结构
-      loadingShow: false,
-      isShowCopyRuleDialog: false,
-      inspectName: '',
-      appSystemId: null,
-      headerObj: {},
-      appSystemCollectionName: '' // 应用系统名称+集合名称
-    };
-  },
-  beforeCreate() {},
-  created() {
-    let query = this.$route.query;
-    if (query && query.appSystemId && query.name) {
-      this.inspectName = query.name;
-      this.appSystemId = parseInt(query.appSystemId);
-      this.getAppCollectionFields({appSystemId: parseInt(query.appSystemId), name: query.name});
-    }
-  },
-  beforeMount() {},
-  mounted() {},
-  beforeUpdate() {},
-  updated() {},
-  activated() {},
-  deactivated() {},
-  beforeDestroy() {},
-  destroyed() {},
-  methods: {
-    getAppCollectionFields(params) {
-      this.loadingShow = true;
-      this.fields = {};
-      this.thresholds = {};
-      this.headerObj = {};
-      this.$api.inspect.definition.getAppCollectionFields(params).then((res) => {
-        if (res.Status == 'OK') {
-          let data = res.Return;
-          this.fields = data.fields;
-          let collectionName = data.label || '';
-          let appSystemName = data.appSystemAbbrName ? (data.appSystemName ? `${data.appSystemAbbrName}(${data.appSystemName})` : data.appSystemAbbrName) : (data.appSystemName || '');
-          this.appSystemCollectionName = appSystemName ? (collectionName ? `${appSystemName} - ${collectionName}` : appSystemName) : (collectionName || '');
-          this.thresholds = {
-            globalThresholds: data.globalThresholds || [],
-            appThresholds: data.appThresholds || []
-          };
-          this.headerObj = {
-            lcd: data.lcd,
-            userVo: data.userVo
-          };
-        }
-      }).finally(() => {
-        this.loadingShow = false;
-        if (this.$route.query && this.$route.query.ruleId) {
-          this.$nextTick(() => {
-            this.$refs.ruleAdd && this.$refs.ruleAdd.jumpTo(`#to_${this.$route.query.ruleId}`);
-          });
-        }
-      });
-    },
-    updateThresholdsList() {
-      // 获取规则列表
-      let ruleAdd = this.$refs.ruleAdd;
-      let formValue = (ruleAdd && ruleAdd.getFormValue()) || '';
-      return (formValue && formValue.thresholds) || [];
-    },
-    getInitData() {
-      return (this.$refs.ruleAdd && this.$refs.ruleAdd.getInitData()) || [];
-    },
-    saveThresholdRule() {
-      // 处理保存
-      if (!this.$refs.ruleAdd.valid()) {
-        return false;
-      }
-      let params = {
-        appSystemId: this.appSystemId,
-        name: this.inspectName,
-        ...this.$refs.ruleAdd.getFormValue()
-      };
-      this.$api.inspect.definition.saveCollectionThresholds(params).then((res) => {
-        if (res.Status == 'OK') {
-          this.getAppCollectionFields({appSystemId: this.appSystemId, name: this.inspectName});
-          this.$Message.success(this.$t('message.savesuccess'));
-        }
-      });
-    },
-    copyRuleOfThreshold() {
-      this.isShowCopyRuleDialog = true;
-    },
-    closeCopyRuleDialog(needRefresh) {
-      this.isShowCopyRuleDialog = false;
-      if (needRefresh) {
-        this.getAppCollectionFields({appSystemId: this.appSystemId, name: this.inspectName});
-      }
-    }
-  },
-  computed: {},
-  watch: {},
-  beforeRouteLeave(to, from, next, url) {
-    if (this.$utils.isSame(this.getInitData(), this.updateThresholdsList())) {
-      //当没有改动时直接跳转页面
-      url ? this.$utils.gotoHref(url) : next(true);
-    } else {
-      let _this = this;
-      if (this.$AuthUtils.hasRole('INSPECT_MODIFY')) {
-        this.$utils.jumpDialog.call(this, {
-          save: {
-            fn: async(vnode) => {
-              return await _this.saveThresholdRule();
-            }
-          }
-        }, to, from, next, url);
-      }
-    }
-  }
-};
-</script>
-
-<style lang="less" scoped>
-</style>
diff --git a/src/views/pages/inspect/applicationNew/threshold/rule-of-threshold-dialog.vue b/src/views/pages/inspect/applicationNew/threshold/rule-of-threshold-dialog.vue
deleted file mode 100644
index bc3940ff9..000000000
--- a/src/views/pages/inspect/applicationNew/threshold/rule-of-threshold-dialog.vue
+++ /dev/null
@@ -1,127 +0,0 @@
-<template>
-  <div>
-    <TsDialog
-      :title="$t('term.inspect.thresholdrule')"
-      type="modal"
-      width="small"
-      :isShow="true"
-      :hasFooter="false"
-      @on-close="closeDialog"
-    >
-      <template v-slot>
-        <div>
-          <Loading
-            :loadingShow="loadingShow"
-            type="fix"
-          ></Loading>
-          <ul v-if="!$utils.isEmptyObj(resourceList)">
-            <li class="current-rule-threshold-wrap">
-              <div>{{ $t('term.inspect.assetthresholdrule') }}</div>
-              <ul>
-                <template v-for="(item,index) in resourceList">
-                  <li
-                    :key="index"
-                    class="text-href mb-sm"
-                    @click="toRuleThresholdPage(item)"
-                  >
-                    {{ item.text }}
-                  </li>
-                </template>
-              </ul>
-            </li>
-          </ul>
-        </div>
-      </template>
-    </TsDialog>
-  </div>
-</template>
-<script>
-export default {
-  name: '', // 选择组合工具弹窗入口
-  components: {},
-  props: {
-    resourceId: {
-      type: [Number, String]
-    }
-  },
-  data() {
-    return {
-      loadingShow: true,
-      resourceList: []
-    };
-  },
-  beforeCreate() {},
-  created() {
-    this.getDataList();
-  },
-  beforeMount() {},
-  mounted() {},
-  beforeUpdate() {},
-  updated() {},
-  activated() {},
-  deactivated() {},
-  beforeDestroy() {},
-  destroyed() {},
-  methods: {
-    closeDialog() {
-      this.$emit('close');
-    },
-    getDataList() {
-      this.loadingShow = true;
-      this.resourceList = [];
-      this.$api.inspect.definition.getThresholdSource({resourceId: this.resourceId}).then(res => {
-        if (res && res.Status == 'OK') {
-          let appSystemVoList = res.Return ? res.Return.appSystemVoList : [];
-          let resourceVo = res.Return ? res.Return.resourceVo : {}; 
-          let collectionName = res.Return ? res.Return.collectionName : ''; 
-          if (!this.$utils.isEmpty(appSystemVoList) && !this.$utils.isEmptyObj(resourceVo)) {
-            appSystemVoList && appSystemVoList.forEach((v) => {
-              this.resourceList.push({
-                appSystemId: v.id,
-                text: `${resourceVo.typeLabel}->${v.abbrName ? (v.name ? v.abbrName + '(' + v.name + ')' : v.abbrName) : ''}${this.$t('term.inspect.thresholdrule')}`,
-                typeName: resourceVo.typeName,
-                typeLabel: resourceVo.typeLabel,
-                collectionName: collectionName
-              });
-            });
-          }
-          if (!this.$utils.isEmptyObj(resourceVo)) {
-            this.resourceList.unshift({
-              flag: 'global', // 全局阈值
-              text: `${resourceVo.typeLabel}->${this.$t('term.inspect.globalthresholdrule')}`,
-              typeName: resourceVo.typeName,
-              typeLabel: resourceVo.typeLabel,
-              collectionName: collectionName
-            });
-          }
-        }
-      }).finally(() => {
-        this.loadingShow = false;
-      });
-    },
-    toRuleThresholdPage(row) {
-      if (row && !this.$utils.isEmptyObj(row)) {
-        if (row.flag == 'global') {
-          this.$router.push({
-            path: '/definition-detail',
-            query: {name: row.collectionName}
-          });
-        } else {
-          this.$router.push({
-            path: '/rule-of-threshold-detail',
-            query: { name: row.collectionName, appSystemId: row.appSystemId}
-          });
-        }
-      }
-    }
-  },
-  filter: {},
-  computed: {},
-  watch: {}
-};
-</script>
-<style lang="less" scoped>
-.current-rule-threshold-wrap {
-  display: flex;
-}
-</style>
diff --git a/src/views/pages/inspect/applicationNew/threshold/rule-of-threshold-manage.vue b/src/views/pages/inspect/applicationNew/threshold/rule-of-threshold-manage.vue
deleted file mode 100644
index 51e3c1eb3..000000000
--- a/src/views/pages/inspect/applicationNew/threshold/rule-of-threshold-manage.vue
+++ /dev/null
@@ -1,157 +0,0 @@
-
-<template>
-  <div>
-    <Loading :loadingShow="loadingShow" type="fix"></Loading>
-    <TsContain>
-      <template v-slot:navigation>
-        <span v-if="$hasBack()" class="text-action tsfont-left" @click="$back()">{{ $getFromPage() }}</span>
-      </template>
-      <template v-slot:topRight>
-        <div>
-          <InputSearcher
-            v-model="formInputSetting.value"
-            v-bind="formInputSetting"
-            @change="getTableList()"
-          ></InputSearcher>
-        </div>
-      </template>
-      <div slot="content">
-        <div v-if="!loadingShow && inspectDefinitionList.length > 0" class="content-main">
-          <div v-for="(item, index) in inspectDefinitionList" :key="index">
-            <div v-if="item && item.cardList && item.cardList.length > 0" class="title text-title ci-title-text">
-              <span class="text-grey tsfont-formstaticlist">{{ item.collection }}</span>
-            </div>
-            <div>
-              <TsCard
-                v-if="item && item.cardList && item.cardList.length > 0"
-                v-bind="item"
-                :sm="8"
-                :lg="6"
-                :xl="6"
-                :xxl="4"
-                :boxShadow="false"
-              >
-                <template slot-scope="{ row }">
-                  <div class="ci-main" @click="toRuleOfThresholdDetail(row)">
-                    <div>
-                      <div class="ci-icon">
-                        <i :class="`tsfont-${row.name}`"></i>
-                      </div>
-                    </div>
-                    <div class="overflow">
-                      <div class="ci-label overflow" :title="row.label">{{ row.label }}</div>
-                      <div class="ci-name overflow text-grey" :title="row.name">{{ row.name }}</div>
-                    </div>
-                  </div>
-                </template>
-              </TsCard>
-            </div>
-          </div>
-        </div>
-        <NoData v-else />
-      </div>
-    </TsContain>
-  </div>
-</template>
-<script>
-export default {
-  name: 'RuleOfThresholdManage', // 巡检规则
-  components: {
-    InputSearcher: () => import('@/resources/components/InputSearcher/InputSearcher.vue'),
-    TsCard: () => import('@/resources/components/TsCard/TsCard.vue')
-  },
-  filters: {},
-  props: {},
-  data() {
-    return {
-      loadingShow: true,
-      inspectDefinitionList: [],
-      appSystemId: null,
-      formInputSetting: {
-        placeholder: this.$t('page.name'),
-        search: true,
-        clearable: true,
-        value: '',
-        border: 'border'
-      }
-
-    };
-  },
-  beforeCreate() {},
-  created() {
-    let query = this.$route.query;
-    if (query && query.appSystemId) {
-      this.appSystemId = parseInt(query.appSystemId);
-      this.getTableList();
-    }
-  },
-  beforeMount() {},
-  mounted() {},
-  beforeUpdate() {},
-  updated() {},
-  activated() {},
-  deactivated() {},
-  beforeDestroy() {},
-  methods: {
-    getTableList() {
-      this.loadingShow = true;
-      this.$api.inspect.definition.getThresholdsCollectionList({appSystemId: this.appSystemId, name: this.formInputSetting.value}).then(res => {
-        if (res.Status == 'OK') {
-          let tempObj = {};
-          let tbodyList = res.Return ? res.Return : [];
-          tbodyList.forEach((item) => {
-            let {collection} = item;
-            if (!tempObj[collection]) {
-              tempObj[collection] = {
-                collection,
-                cardList: []
-              };
-            }
-            tempObj[collection].cardList.push(item);
-          });
-          this.inspectDefinitionList = Object.values(tempObj);
-        }
-      }).finally(() => {
-        this.loadingShow = false;
-      });
-    },
-    toRuleOfThresholdDetail(row) {
-      if (row && !this.$utils.isEmptyObj(row)) {
-        this.$router.push({
-          path: '/rule-of-threshold-detail',
-          query: { appSystemId: this.appSystemId, name: row.name, label: row.label }
-        });
-      }
-    }
-  },
-  computed: {},
-  watch: {}
-};
-</script>
-<style lang="less" scoped>
-.content-main {
-  .type-main{
-    margin-bottom:10px;
-  }
-  .ci-title-text{
-    padding-left: 12px;
-  }
-}
-.ci-main {
-  cursor: pointer;
-  display: grid;
-  width: 100%;
-  grid-template-columns: 40px auto;
-  margin: 10px;
-  .ci-icon {
-    font-size: 24px;
-  }
-  .ci-label {
-    font-size: 14px;
-    margin-bottom: 2px;
-  }
-  .ci-name {
-    font-size: 12px;
-  }
-}
-</style>
diff --git a/src/views/pages/inspect/router.js b/src/views/pages/inspect/router.js
index 8cc8fb565..b34fb69b7 100644
--- a/src/views/pages/inspect/router.js
+++ b/src/views/pages/inspect/router.js
@@ -21,7 +21,6 @@ const ciEntityView = () => import('@/views/pages/cmdb/cientity/cientity-view.vue
 const ciEntityEdit = () => import('@/views/pages/cmdb/cientity/cientity-edit.vue');//配置项编辑
 
 const applicationManage = () => import('./application/application-manage.vue');//应用巡检
-const applicationManageNew = () => import('./applicationNew/application-manage.vue');//新的应用巡检
 const configfileManage = () => import('./configfile/configfile-manage.vue');
 const configfileDetail = () => import('./configfile/configfile-detail.vue');
 const configfileListManage = () => import('./configfile/configfile-list-manage.vue');
@@ -141,18 +140,6 @@ export default [
       authority: 'INSPECT_BASE',
       type: 'inspectmanage'
     }
-  }, 
-  {
-    path: '/application-manage-new',
-    name: 'application-manage-new',
-    component: applicationManageNew,
-    meta: {
-      title: '新的应用巡检',
-      ismenu: true,
-      icon: 'tsfont-app',
-      authority: 'INSPECT_BASE',
-      type: 'inspectmanage'
-    }
   },
   {
     path: '/assets-detail-:id?',
-- 
Gitee


From 0b547995777d459e1899fd39cdd2c63ee34fb124 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Wed, 2 Apr 2025 11:08:25 +0800
Subject: [PATCH 19/20] commit

---
 .../application/inspection-assets-manage.vue  | 238 +++++-------------
 1 file changed, 59 insertions(+), 179 deletions(-)

diff --git a/src/views/pages/inspect/application/inspection-assets-manage.vue b/src/views/pages/inspect/application/inspection-assets-manage.vue
index 718e94837..cfabcff89 100644
--- a/src/views/pages/inspect/application/inspection-assets-manage.vue
+++ b/src/views/pages/inspect/application/inspection-assets-manage.vue
@@ -24,164 +24,55 @@
     </div>
     <div v-if="tableList && tableList.length > 0 ">
       <div v-for="(item, index) in tableList" :key="index">
-        <div class="h3 padding-sm">{{ item.viewLabel }}</div>
+        <div class="h3 padding-sm">{{ item.type.label }}</div>
         <TsTable
+          :theadList="theadList"
           v-bind="filterTypeFields(item)"
           @changeCurrent="(currentPage) => changeCurrent(currentPage, item, index)"
           @changePageSize="(pageSize) => changePageSize(pageSize,item, index)"
         >
           <template v-slot:ip="{ row }">
-            <span class="text-href" @click.stop="gotoDetails(row)">
-              <span>{{ row.ip.ip }}</span>
-              <span v-if="row.ip.port">:{{ row.ip.port }}</span>
+            <span class="text-href" @click="gotoDetails(row)">
+              <span>{{ row.ip }}</span>
+              <span v-if="row.port">:{{ row.port }}</span>
             </span>
           </template>
-          <template v-slot:allIpList="{ row }">
-            <div v-if="!$utils.isEmpty(row.allIpList)">
-              <Tag
-                v-for="(v, vindex) in row.allIpList"
-                :key="vindex"
-                class="cursor-pointer"
-                @click.native="toCientityView(v)"
-              >
-                {{ v.name }}
-              </Tag>
-            </div>
-            <div v-else></div>
-          </template>
-          <template v-slot:lcu="{row}">
-            <UserCard v-bind="row.lcu" :hideAvatar="true"></UserCard>
-          </template>
-          <template v-slot:lcd="{ row }">
-            <div v-if="row.lcd">{{ row.lcd | formatDate }}</div>
-          </template>
-          <template v-slot:fcu="{ row }">
-            <UserCard v-bind="row.fcu" :hideAvatar="true"></UserCard>
-          </template>
-          <template v-slot:fcd="{ row }">
-            <div v-if="row.fcd">{{ row.fcd | formatDate }}</div>
-          </template>
-          <template v-slot:monitor="{ row }">
+          <template v-slot:monitorStatus="{ row }">
             <!-- 监控状态 -->
-            <span v-if="row.monitor && row.monitor.time" :title="row.monitor.time | formatDate">
-              <span :class="[row.monitor.cssClass, {'background-FATAL': row.monitor.value== 'FATAL'}]" class="vertical">{{ row.monitor.text }} </span>
+            <span v-if="row.monitorStatusJson && row.monitorTime" :title="row.monitorTime | formatDate">
+              <span :class="[row.monitorStatusJson.cssClass, {'background-FATAL': row.monitorStatusJson.value== 'FATAL'}]" class="vertical cursor">{{ row.monitorStatusJson.text }} </span>
               <span class="text-title">
-                {{ handleTimes(row.monitor.time) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
+                {{ handleTimes(row.monitorTime) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
               </span>
             </span>
-            <span v-else></span>
+            <span v-else>
+              <span>-</span>
+            </span>
           </template>
-          <template v-slot:inspect="{ row }">
+          <template v-slot:inspectStatus="{ row }">
             <!-- 巡检状态 -->
-            <span v-if="row.inspect && row.inspect.time" :title="row.inspect.time | formatDate">
-              <span :class="[row.inspect.cssClass, {'background-FATAL': row.inspect.value== 'FATAL'}]" class="vertical cursor" @click="toInspectStatusDetail(row)">{{ row.inspect.text }} </span>
+            <span v-if="row.inspectStatusJson && row.inspectTime" :title="row.inspectTime | formatDate">
+              <span :class="[row.inspectStatusJson.cssClass, {'background-FATAL': row.inspectStatusJson.value== 'FATAL'}]" class="vertical cursor" @click="toInspectStatusDetail(row)">{{ row.inspectStatusJson.text }} </span>
               <span class="text-title">
-                {{ handleTimes(row.inspect.time) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
+                {{ handleTimes(row.inspectTime) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
               </span>
             </span>
-            <span v-else>
-              <span>-</span>
-            </span>
-          </template>
-          <template v-slot:taskStatus="{ row }">
-            <CommonStatus
-              v-if="row.taskStatus"
-              :statusName="row.taskStatus.text"
-              :statusValue="row.taskStatus.value"
-              type="text"
-            ></CommonStatus>
             <span v-else>-</span>
           </template>
-          <template v-slot:vendor="{ row }">
-            <Tag
-              v-if="!$utils.isEmpty(row.vendor)"
-              class="cursor-pointer"
-              @click.native="toCientityView(row.vendor)"
-            >
-              {{ row.vendor.name }}
-            </Tag>
-            <span v-else></span>
-          </template>
-          <template v-slot:appModule="{ row }">
-            <div v-if="!$utils.isEmpty(row.appModule)" class="text-href" @click="toCientityView(row.appModule)">
-              <span :class="row.appModule.ciIcon"></span>
-              <span>{{ row.appModule.name }}</span>
-            </div>
-          </template>
-          <template v-slot:appEnvironment="{ row }">
-            <Tag
-              v-if="!$utils.isEmpty(row.appEnvironment)"
-              class="cursor-pointer"
-              @click.native="toGlobalAttrManage()"
-            >
-              {{ row.appEnvironment.value }}
-            </Tag>
-          </template>
-          <template v-slot:appSystem="{row}">
-            <!-- 应用系统 -->
-            <div v-if="!$utils.isEmpty(row.appSystem)" class="text-href" @click="toCientityView(row.appSystem)">
-              <span :class="row.appSystem.ciIcon"></span>
-              <span>{{ row.appSystem.name }}</span>
-            </div>
+          <template v-slot:bgList="{ row }">
+            <GroupList :dataList="row.bgList" type="tag" textName="bgName"></GroupList>
           </template>
           <template v-slot:ownerList="{ row }">
-            <div v-if="!$utils.isEmpty(row.ownerList)">
-              <Tag
-                v-for="(o, oindex) in row.ownerList"
-                :key="oindex"
-                class="cursor-pointer"
-                @click.native="toCientityView(o);"
-              >
-                {{ o.name }}
-              </Tag>
-            </div>
-            <div v-else></div>
-          </template>
-          <template v-slot:businessGroupList="{ row }">
-            <div v-if="!$utils.isEmpty(row.businessGroupList)">
-              <Tag
-                v-for="(b, bindex) in row.businessGroupList"
-                :key="bindex"
-                class="cursor-pointer"
-                @click.native="toCientityView(b)"
-              >
-                {{ b.name }}
-              </Tag>
-            </div>
-            <div v-else></div>
+            <GroupList :dataList="row.ownerList" type="tag" textName="userName"></GroupList>
           </template>
-          <template v-slot:state="{row}">
-            <!-- 资产状态 -->
-            <Tag
-              v-if="!$utils.isEmpty(row.state)"
-              class="cursor-pointer"
-              @click.native="toCientityView(row.state)"
-            >
-              {{ row.state.name }}
-            </Tag>
-          </template>
-          <template v-slot:dataCenter="{ row }">
-            <!-- 数据中心 -->
-            <Tag
-              v-if="!$utils.isEmpty(row.dataCenter)"
-              class="cursor-pointer"
-              @click.native="toCientityView(row.dataCenter)"
-            >
-              {{ row.dataCenter.name }}
-            </Tag>
-            <span v-else></span>
-          </template>
-          <template v-slot:ci="{row}">
-            <!-- 模型 -->
-            <div v-if="!$utils.isEmpty(row.ci)" class="text-href" @click="toCiView(row.ci)">
-              <span :class="row.ci.icon"></span>
-              <span>{{ row.ci.label }}</span>
-            </div>
+          <template v-slot:clusterName="{row}">
+            <!-- 所在集群 -->
+            <span v-if="row" class="text-href" @click="gotoCluster(row)">{{ row.clusterName }}</span>
           </template>
           <template v-slot:action="{row}">
             <div class="tstable-action">
               <ul class="tstable-action-ul">
-                <li v-if="row && row.jobPhaseNodeVo && row.jobPhaseNodeVo.jobId" class="tsfont-history" @click="toJobDetail(row)">{{ $t('term.inspect.jobdetail') }}</li>
+                <li class="tsfont-history" @click="toJobDetail(row)">{{ $t('term.inspect.jobdetail') }}</li>
                 <li v-auth="'INSPECT_EXECUTE'" class="tsfont-inspection" @click="doInspection(row)">{{ $t('term.inspect.inspect') }}</li>
                 <li class="tsfont-setting" @click="openRuleThresholdDialog(row)">{{ $t('term.inspect.thresholdrule') }}</li>
               </ul>
@@ -208,12 +99,10 @@
 export default {
   name: '',
   components: {
-    UserCard: () => import('@/resources/components/UserCard/UserCard.vue'),
+    GroupList: () => import('@/resources/components/GroupList/GroupList.vue'),
     TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
     InspectionDialog: () => import('../assetsInspect/inspection-dialog.vue'), // 单个巡检
-    RuleOfThresholdDialog: () => import('./threshold/rule-of-threshold-dialog.vue'), //阈值规则
-    CommonStatus: () => import('@/resources/components/Status/CommonStatus.vue')
-    
+    RuleOfThresholdDialog: () => import('@/views/pages/inspect/application/threshold/rule-of-threshold-dialog.vue')
   },
   filters: {},
   props: {
@@ -245,22 +134,22 @@ export default {
         rowNum: 0,
         pageSize: 20,
         currentPage: 1
-      }
-      // theadList: [
-      //   { key: 'ip', title: this.$t('page.ipaddress')},
-      //   { key: 'name', title: this.$t('page.name')},
-      //   { key: 'monitorStatus', title: this.$t('term.inspect.monitoringstate')},
-      //   { key: 'inspectStatus', title: this.$t('term.autoexec.inspectstatus')},
-      //   { key: 'stateName', title: this.$t('term.autoexec.assetstatus')},
-      //   { key: 'envName', title: this.$t('term.inspect.envname')},
-      //   { key: 'clusterName', title: this.$t('term.inspect.clustername')},
-      //   { key: 'dataCenterName', title: this.$t('term.inspect.datacenter')},
-      //   { key: 'networkArea', title: this.$t('page.networkarea')},
-      //   { key: 'ownerList', title: this.$t('page.owner')},
-      //   { key: 'bgList', title: this.$t('term.autoexec.subordinatedepartment')},
-      //   { key: 'maintenanceWindow', title: this.$t('term.deploy.maintenancewindow')},
-      //   { key: 'action'}
-      // ]
+      },
+      theadList: [
+        { key: 'ip', title: this.$t('page.ipaddress')},
+        { key: 'name', title: this.$t('page.name')},
+        { key: 'monitorStatus', title: this.$t('term.inspect.monitoringstate')},
+        { key: 'inspectStatus', title: this.$t('term.autoexec.inspectstatus')},
+        { key: 'stateName', title: this.$t('term.autoexec.assetstatus')},
+        { key: 'envName', title: this.$t('term.inspect.envname')},
+        { key: 'clusterName', title: this.$t('term.inspect.clustername')},
+        { key: 'dataCenterName', title: this.$t('term.inspect.datacenter')},
+        { key: 'networkArea', title: this.$t('page.networkarea')},
+        { key: 'ownerList', title: this.$t('page.owner')},
+        { key: 'bgList', title: this.$t('term.autoexec.subordinatedepartment')},
+        { key: 'maintenanceWindow', title: this.$t('term.deploy.maintenancewindow')},
+        { key: 'action'}
+      ]
     };
   },
   beforeCreate() {},
@@ -279,9 +168,7 @@ export default {
     toJobDetail(row) {
       // 打开新的作业详情
       if (row && row.jobPhaseNodeVo) {
-        window.open(HOME + '/inspect.html#/job-detail?id=' + row.jobPhaseNodeVo.jobId + '&status=' + row.jobPhaseNodeVo.status, '_blank');
-       
-        // this.$router.push({path: '/job-detail?id=' + row.jobPhaseNodeVo.jobId + '&status=' + row.jobPhaseNodeVo.status});
+        this.$router.push({path: '/job-detail?id=' + row.jobPhaseNodeVo.jobId + '&status=' + row.jobPhaseNodeVo.status});
       }
     },
     doInspection(row) {
@@ -304,12 +191,6 @@ export default {
       if (currentRow && currentRow.hasOwnProperty('type')) {
         delete currentRow.type;
       }
-      if (currentRow && currentRow.hasOwnProperty('theadList')) {
-        currentRow.theadList.push({
-          title: '',
-          key: 'action'
-        });
-      }
       return currentRow;
     },
     changeCurrent(currentPage, item, index) {
@@ -318,11 +199,9 @@ export default {
     },
     changePageSize(pageSize, item, index) {
       this.tableData.pageSize = pageSize;
-      this.tableData.currentPage = 1;
       this.getTableData(item, index);
     },
     async initData() {
-      this.tableData.currentPage = 1;
       await this.getEnvList();
       await this.getTableData();
     },
@@ -361,7 +240,7 @@ export default {
         return false;
       }
       this.loadingShow = true;
-      this.$api.inspect.applicationInspect.getNewapplicationInspectList(params).then(res => {
+      this.$api.inspect.applicationInspect.getapplicationInspectList(params).then(res => {
         if (res.Status == 'OK') {
           if (row && !this.$utils.isEmptyObj(row)) {
             // 内嵌列表翻页
@@ -376,31 +255,32 @@ export default {
         this.loadingShow = false;
       });
     },
+    gotoCluster(row) {
+      // 集群跳转
+      if (row && !this.$utils.isEmptyObj(row)) {
+        this.$router.push({ path: './ci/' + row.clusterTypeId + '/cientity-view/' + row.clusterId });
+      }
+    },
     toCientityView(row) {
       // 应用清单详情
       if (row && !this.$utils.isEmptyObj(row)) {
-        window.open(HOME + '/inspect.html#/ci/' + row.ciId + '/cientity-view/' + row.id, '_blank');
-      
-        // this.$router.push({ path: './ci/' + row.typeId + '/cientity-view/' + row.id });
+        this.$router.push({ path: './ci/' + row.typeId + '/cientity-view/' + row.id });
       }
     },
     toInspectStatusDetail(row) {
       // 巡检状态详情
       if (row && !this.$utils.isEmptyObj(row)) {
-        window.open(HOME + '/inspect.html#/assets-detail-' + row.id, '_blank');
+        if (this.moduleName == 'inspect') {
+          // inspect模块
+          this.$router.push({ path: './assets-detail-' + row.id});
+        } else {
+          // cmdb模块
+          this.$router.push({ path: './inspect-status-detail-' + row.id});
+        }
       }
     },
     gotoDetails(row) {
-      window.open(HOME + '/inspect.html#/assets-detail-' + row.id, '_blank');
-    },
-    toGlobalAttrManage() {
-      //全局属性管理
-      window.open(HOME + '/cmdb.html#/global-attr-manage', '_blank');
-    },
-    toCiView(ci) {
-      if (ci && !this.$utils.isEmptyObj(ci)) {
-        window.open(HOME + '/cmdb.html#/ci-view/' + ci.id, '_blank');
-      }
+      this.$router.push({ path: './assets-detail-' + row.id });
     },
     selectedEnv(name) {
       let envId = null;
@@ -410,7 +290,6 @@ export default {
         }
       });
       this.envId = envId;
-      this.tableData.currentPage = 1;
       this.getTableData();
     },
     handleTimes(time) {
@@ -421,6 +300,7 @@ export default {
       return data;
     },
     openRuleThresholdDialog(row) {
+      console.log(row);
       if (row && row.id) {
         this.resourceId = row.id;
         this.isShowRuleThresholdDialog = true;
-- 
Gitee


From 13e72ded5307cea1f808e04f20115f1c87099ed5 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Wed, 2 Apr 2025 11:10:32 +0800
Subject: [PATCH 20/20] =?UTF-8?q?[=E5=85=B3=E8=81=94]=20#[1349157963399168?=
 =?UTF-8?q?]CMDB=E5=BA=94=E7=94=A8=E6=B8=85=E5=8D=95=E6=94=B9=E6=88=90?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=B1=82=E7=BA=A7=E5=8F=AF=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=20http://192.168.0.96:8090/demo/rdm.html#/story-detail/9390509?=
 =?UTF-8?q?47543040/939050947543042/1349157963399168?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../application/inspection-assets-manage.vue  | 238 +++++++++++++-----
 1 file changed, 179 insertions(+), 59 deletions(-)

diff --git a/src/views/pages/inspect/application/inspection-assets-manage.vue b/src/views/pages/inspect/application/inspection-assets-manage.vue
index cfabcff89..718e94837 100644
--- a/src/views/pages/inspect/application/inspection-assets-manage.vue
+++ b/src/views/pages/inspect/application/inspection-assets-manage.vue
@@ -24,55 +24,164 @@
     </div>
     <div v-if="tableList && tableList.length > 0 ">
       <div v-for="(item, index) in tableList" :key="index">
-        <div class="h3 padding-sm">{{ item.type.label }}</div>
+        <div class="h3 padding-sm">{{ item.viewLabel }}</div>
         <TsTable
-          :theadList="theadList"
           v-bind="filterTypeFields(item)"
           @changeCurrent="(currentPage) => changeCurrent(currentPage, item, index)"
           @changePageSize="(pageSize) => changePageSize(pageSize,item, index)"
         >
           <template v-slot:ip="{ row }">
-            <span class="text-href" @click="gotoDetails(row)">
-              <span>{{ row.ip }}</span>
-              <span v-if="row.port">:{{ row.port }}</span>
+            <span class="text-href" @click.stop="gotoDetails(row)">
+              <span>{{ row.ip.ip }}</span>
+              <span v-if="row.ip.port">:{{ row.ip.port }}</span>
             </span>
           </template>
-          <template v-slot:monitorStatus="{ row }">
+          <template v-slot:allIpList="{ row }">
+            <div v-if="!$utils.isEmpty(row.allIpList)">
+              <Tag
+                v-for="(v, vindex) in row.allIpList"
+                :key="vindex"
+                class="cursor-pointer"
+                @click.native="toCientityView(v)"
+              >
+                {{ v.name }}
+              </Tag>
+            </div>
+            <div v-else></div>
+          </template>
+          <template v-slot:lcu="{row}">
+            <UserCard v-bind="row.lcu" :hideAvatar="true"></UserCard>
+          </template>
+          <template v-slot:lcd="{ row }">
+            <div v-if="row.lcd">{{ row.lcd | formatDate }}</div>
+          </template>
+          <template v-slot:fcu="{ row }">
+            <UserCard v-bind="row.fcu" :hideAvatar="true"></UserCard>
+          </template>
+          <template v-slot:fcd="{ row }">
+            <div v-if="row.fcd">{{ row.fcd | formatDate }}</div>
+          </template>
+          <template v-slot:monitor="{ row }">
             <!-- 监控状态 -->
-            <span v-if="row.monitorStatusJson && row.monitorTime" :title="row.monitorTime | formatDate">
-              <span :class="[row.monitorStatusJson.cssClass, {'background-FATAL': row.monitorStatusJson.value== 'FATAL'}]" class="vertical cursor">{{ row.monitorStatusJson.text }} </span>
+            <span v-if="row.monitor && row.monitor.time" :title="row.monitor.time | formatDate">
+              <span :class="[row.monitor.cssClass, {'background-FATAL': row.monitor.value== 'FATAL'}]" class="vertical">{{ row.monitor.text }} </span>
               <span class="text-title">
-                {{ handleTimes(row.monitorTime) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
+                {{ handleTimes(row.monitor.time) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
               </span>
             </span>
-            <span v-else>
-              <span>-</span>
-            </span>
+            <span v-else></span>
           </template>
-          <template v-slot:inspectStatus="{ row }">
+          <template v-slot:inspect="{ row }">
             <!-- 巡检状态 -->
-            <span v-if="row.inspectStatusJson && row.inspectTime" :title="row.inspectTime | formatDate">
-              <span :class="[row.inspectStatusJson.cssClass, {'background-FATAL': row.inspectStatusJson.value== 'FATAL'}]" class="vertical cursor" @click="toInspectStatusDetail(row)">{{ row.inspectStatusJson.text }} </span>
+            <span v-if="row.inspect && row.inspect.time" :title="row.inspect.time | formatDate">
+              <span :class="[row.inspect.cssClass, {'background-FATAL': row.inspect.value== 'FATAL'}]" class="vertical cursor" @click="toInspectStatusDetail(row)">{{ row.inspect.text }} </span>
               <span class="text-title">
-                {{ handleTimes(row.inspectTime) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
+                {{ handleTimes(row.inspect.time) | formatTimeCost({unitNumber: 1, language: 'zh',unit: 'minute'}) }} {{ $t('page.before') }}
               </span>
             </span>
+            <span v-else>
+              <span>-</span>
+            </span>
+          </template>
+          <template v-slot:taskStatus="{ row }">
+            <CommonStatus
+              v-if="row.taskStatus"
+              :statusName="row.taskStatus.text"
+              :statusValue="row.taskStatus.value"
+              type="text"
+            ></CommonStatus>
             <span v-else>-</span>
           </template>
-          <template v-slot:bgList="{ row }">
-            <GroupList :dataList="row.bgList" type="tag" textName="bgName"></GroupList>
+          <template v-slot:vendor="{ row }">
+            <Tag
+              v-if="!$utils.isEmpty(row.vendor)"
+              class="cursor-pointer"
+              @click.native="toCientityView(row.vendor)"
+            >
+              {{ row.vendor.name }}
+            </Tag>
+            <span v-else></span>
+          </template>
+          <template v-slot:appModule="{ row }">
+            <div v-if="!$utils.isEmpty(row.appModule)" class="text-href" @click="toCientityView(row.appModule)">
+              <span :class="row.appModule.ciIcon"></span>
+              <span>{{ row.appModule.name }}</span>
+            </div>
+          </template>
+          <template v-slot:appEnvironment="{ row }">
+            <Tag
+              v-if="!$utils.isEmpty(row.appEnvironment)"
+              class="cursor-pointer"
+              @click.native="toGlobalAttrManage()"
+            >
+              {{ row.appEnvironment.value }}
+            </Tag>
+          </template>
+          <template v-slot:appSystem="{row}">
+            <!-- 应用系统 -->
+            <div v-if="!$utils.isEmpty(row.appSystem)" class="text-href" @click="toCientityView(row.appSystem)">
+              <span :class="row.appSystem.ciIcon"></span>
+              <span>{{ row.appSystem.name }}</span>
+            </div>
           </template>
           <template v-slot:ownerList="{ row }">
-            <GroupList :dataList="row.ownerList" type="tag" textName="userName"></GroupList>
+            <div v-if="!$utils.isEmpty(row.ownerList)">
+              <Tag
+                v-for="(o, oindex) in row.ownerList"
+                :key="oindex"
+                class="cursor-pointer"
+                @click.native="toCientityView(o);"
+              >
+                {{ o.name }}
+              </Tag>
+            </div>
+            <div v-else></div>
+          </template>
+          <template v-slot:businessGroupList="{ row }">
+            <div v-if="!$utils.isEmpty(row.businessGroupList)">
+              <Tag
+                v-for="(b, bindex) in row.businessGroupList"
+                :key="bindex"
+                class="cursor-pointer"
+                @click.native="toCientityView(b)"
+              >
+                {{ b.name }}
+              </Tag>
+            </div>
+            <div v-else></div>
           </template>
-          <template v-slot:clusterName="{row}">
-            <!-- 所在集群 -->
-            <span v-if="row" class="text-href" @click="gotoCluster(row)">{{ row.clusterName }}</span>
+          <template v-slot:state="{row}">
+            <!-- 资产状态 -->
+            <Tag
+              v-if="!$utils.isEmpty(row.state)"
+              class="cursor-pointer"
+              @click.native="toCientityView(row.state)"
+            >
+              {{ row.state.name }}
+            </Tag>
+          </template>
+          <template v-slot:dataCenter="{ row }">
+            <!-- 数据中心 -->
+            <Tag
+              v-if="!$utils.isEmpty(row.dataCenter)"
+              class="cursor-pointer"
+              @click.native="toCientityView(row.dataCenter)"
+            >
+              {{ row.dataCenter.name }}
+            </Tag>
+            <span v-else></span>
+          </template>
+          <template v-slot:ci="{row}">
+            <!-- 模型 -->
+            <div v-if="!$utils.isEmpty(row.ci)" class="text-href" @click="toCiView(row.ci)">
+              <span :class="row.ci.icon"></span>
+              <span>{{ row.ci.label }}</span>
+            </div>
           </template>
           <template v-slot:action="{row}">
             <div class="tstable-action">
               <ul class="tstable-action-ul">
-                <li class="tsfont-history" @click="toJobDetail(row)">{{ $t('term.inspect.jobdetail') }}</li>
+                <li v-if="row && row.jobPhaseNodeVo && row.jobPhaseNodeVo.jobId" class="tsfont-history" @click="toJobDetail(row)">{{ $t('term.inspect.jobdetail') }}</li>
                 <li v-auth="'INSPECT_EXECUTE'" class="tsfont-inspection" @click="doInspection(row)">{{ $t('term.inspect.inspect') }}</li>
                 <li class="tsfont-setting" @click="openRuleThresholdDialog(row)">{{ $t('term.inspect.thresholdrule') }}</li>
               </ul>
@@ -99,10 +208,12 @@
 export default {
   name: '',
   components: {
-    GroupList: () => import('@/resources/components/GroupList/GroupList.vue'),
+    UserCard: () => import('@/resources/components/UserCard/UserCard.vue'),
     TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
     InspectionDialog: () => import('../assetsInspect/inspection-dialog.vue'), // 单个巡检
-    RuleOfThresholdDialog: () => import('@/views/pages/inspect/application/threshold/rule-of-threshold-dialog.vue')
+    RuleOfThresholdDialog: () => import('./threshold/rule-of-threshold-dialog.vue'), //阈值规则
+    CommonStatus: () => import('@/resources/components/Status/CommonStatus.vue')
+    
   },
   filters: {},
   props: {
@@ -134,22 +245,22 @@ export default {
         rowNum: 0,
         pageSize: 20,
         currentPage: 1
-      },
-      theadList: [
-        { key: 'ip', title: this.$t('page.ipaddress')},
-        { key: 'name', title: this.$t('page.name')},
-        { key: 'monitorStatus', title: this.$t('term.inspect.monitoringstate')},
-        { key: 'inspectStatus', title: this.$t('term.autoexec.inspectstatus')},
-        { key: 'stateName', title: this.$t('term.autoexec.assetstatus')},
-        { key: 'envName', title: this.$t('term.inspect.envname')},
-        { key: 'clusterName', title: this.$t('term.inspect.clustername')},
-        { key: 'dataCenterName', title: this.$t('term.inspect.datacenter')},
-        { key: 'networkArea', title: this.$t('page.networkarea')},
-        { key: 'ownerList', title: this.$t('page.owner')},
-        { key: 'bgList', title: this.$t('term.autoexec.subordinatedepartment')},
-        { key: 'maintenanceWindow', title: this.$t('term.deploy.maintenancewindow')},
-        { key: 'action'}
-      ]
+      }
+      // theadList: [
+      //   { key: 'ip', title: this.$t('page.ipaddress')},
+      //   { key: 'name', title: this.$t('page.name')},
+      //   { key: 'monitorStatus', title: this.$t('term.inspect.monitoringstate')},
+      //   { key: 'inspectStatus', title: this.$t('term.autoexec.inspectstatus')},
+      //   { key: 'stateName', title: this.$t('term.autoexec.assetstatus')},
+      //   { key: 'envName', title: this.$t('term.inspect.envname')},
+      //   { key: 'clusterName', title: this.$t('term.inspect.clustername')},
+      //   { key: 'dataCenterName', title: this.$t('term.inspect.datacenter')},
+      //   { key: 'networkArea', title: this.$t('page.networkarea')},
+      //   { key: 'ownerList', title: this.$t('page.owner')},
+      //   { key: 'bgList', title: this.$t('term.autoexec.subordinatedepartment')},
+      //   { key: 'maintenanceWindow', title: this.$t('term.deploy.maintenancewindow')},
+      //   { key: 'action'}
+      // ]
     };
   },
   beforeCreate() {},
@@ -168,7 +279,9 @@ export default {
     toJobDetail(row) {
       // 打开新的作业详情
       if (row && row.jobPhaseNodeVo) {
-        this.$router.push({path: '/job-detail?id=' + row.jobPhaseNodeVo.jobId + '&status=' + row.jobPhaseNodeVo.status});
+        window.open(HOME + '/inspect.html#/job-detail?id=' + row.jobPhaseNodeVo.jobId + '&status=' + row.jobPhaseNodeVo.status, '_blank');
+       
+        // this.$router.push({path: '/job-detail?id=' + row.jobPhaseNodeVo.jobId + '&status=' + row.jobPhaseNodeVo.status});
       }
     },
     doInspection(row) {
@@ -191,6 +304,12 @@ export default {
       if (currentRow && currentRow.hasOwnProperty('type')) {
         delete currentRow.type;
       }
+      if (currentRow && currentRow.hasOwnProperty('theadList')) {
+        currentRow.theadList.push({
+          title: '',
+          key: 'action'
+        });
+      }
       return currentRow;
     },
     changeCurrent(currentPage, item, index) {
@@ -199,9 +318,11 @@ export default {
     },
     changePageSize(pageSize, item, index) {
       this.tableData.pageSize = pageSize;
+      this.tableData.currentPage = 1;
       this.getTableData(item, index);
     },
     async initData() {
+      this.tableData.currentPage = 1;
       await this.getEnvList();
       await this.getTableData();
     },
@@ -240,7 +361,7 @@ export default {
         return false;
       }
       this.loadingShow = true;
-      this.$api.inspect.applicationInspect.getapplicationInspectList(params).then(res => {
+      this.$api.inspect.applicationInspect.getNewapplicationInspectList(params).then(res => {
         if (res.Status == 'OK') {
           if (row && !this.$utils.isEmptyObj(row)) {
             // 内嵌列表翻页
@@ -255,32 +376,31 @@ export default {
         this.loadingShow = false;
       });
     },
-    gotoCluster(row) {
-      // 集群跳转
-      if (row && !this.$utils.isEmptyObj(row)) {
-        this.$router.push({ path: './ci/' + row.clusterTypeId + '/cientity-view/' + row.clusterId });
-      }
-    },
     toCientityView(row) {
       // 应用清单详情
       if (row && !this.$utils.isEmptyObj(row)) {
-        this.$router.push({ path: './ci/' + row.typeId + '/cientity-view/' + row.id });
+        window.open(HOME + '/inspect.html#/ci/' + row.ciId + '/cientity-view/' + row.id, '_blank');
+      
+        // this.$router.push({ path: './ci/' + row.typeId + '/cientity-view/' + row.id });
       }
     },
     toInspectStatusDetail(row) {
       // 巡检状态详情
       if (row && !this.$utils.isEmptyObj(row)) {
-        if (this.moduleName == 'inspect') {
-          // inspect模块
-          this.$router.push({ path: './assets-detail-' + row.id});
-        } else {
-          // cmdb模块
-          this.$router.push({ path: './inspect-status-detail-' + row.id});
-        }
+        window.open(HOME + '/inspect.html#/assets-detail-' + row.id, '_blank');
       }
     },
     gotoDetails(row) {
-      this.$router.push({ path: './assets-detail-' + row.id });
+      window.open(HOME + '/inspect.html#/assets-detail-' + row.id, '_blank');
+    },
+    toGlobalAttrManage() {
+      //全局属性管理
+      window.open(HOME + '/cmdb.html#/global-attr-manage', '_blank');
+    },
+    toCiView(ci) {
+      if (ci && !this.$utils.isEmptyObj(ci)) {
+        window.open(HOME + '/cmdb.html#/ci-view/' + ci.id, '_blank');
+      }
     },
     selectedEnv(name) {
       let envId = null;
@@ -290,6 +410,7 @@ export default {
         }
       });
       this.envId = envId;
+      this.tableData.currentPage = 1;
       this.getTableData();
     },
     handleTimes(time) {
@@ -300,7 +421,6 @@ export default {
       return data;
     },
     openRuleThresholdDialog(row) {
-      console.log(row);
       if (row && row.id) {
         this.resourceId = row.id;
         this.isShowRuleThresholdDialog = true;
-- 
Gitee