From c99844cf0d74f6dd59d7f003e8bd1af66ce8d487 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Tue, 30 Aug 2022 15:41:48 +0800
Subject: [PATCH 01/37] =?UTF-8?q?fix=20:=20=E5=91=8A=E8=AD=A6=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E8=A1=A8=E8=BE=BE=E5=BC=8F=E8=BE=93=E5=85=A5=E5=85=89?=
 =?UTF-8?q?=E6=A0=87=E9=BB=91=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assets/css/components/common/rightBox/alertRuleBox.scss    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/alertRuleBox.scss b/nezha-fronted/src/assets/css/components/common/rightBox/alertRuleBox.scss
index bcaf315f8..a59e9559b 100644
--- a/nezha-fronted/src/assets/css/components/common/rightBox/alertRuleBox.scss
+++ b/nezha-fronted/src/assets/css/components/common/rightBox/alertRuleBox.scss
@@ -76,6 +76,9 @@
       color: #FFFFFF;
     }
   }
+  .ͼ2 .cm-content{
+    caret-color:$--color-text-regular;
+  }
 }
 .severity-item{
   color: $--color-text-secondary;

From e7560ffd7f1e6e5e1ab2d2bc66e764d74f2ff123 Mon Sep 17 00:00:00 2001
From: wenzhijie <wenzhijie@geedgenetworks.com>
Date: Tue, 30 Aug 2022 16:48:17 +0800
Subject: [PATCH 02/37] =?UTF-8?q?NEZ-2153=20feat:=20Task=20issue=20?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E5=BC=80=E5=8F=91(?=
 =?UTF-8?q?=E8=8D=89=E7=A8=BF=E7=89=88)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/bottomBox/bottomBox.vue |   9 +-
 .../common/bottomBox/tabs/issueTab.vue        | 405 ++++++++++++++++++
 .../common/table/settings/issueTable.vue      |   2 +-
 3 files changed, 414 insertions(+), 2 deletions(-)
 create mode 100644 nezha-fronted/src/components/common/bottomBox/tabs/issueTab.vue

diff --git a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
index c24077f29..bd2731bb9 100644
--- a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
+++ b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
@@ -66,6 +66,8 @@
         <record-rule-eval-log v-if="from === fromRoute.recordRule && targetTab === 'recordRule'" :from="from" :obj="obj" :tabs="tabs.recordRule" @changeTab="changeTab" :targetTab.sync="targetTab"></record-rule-eval-log>
         <!--alertRule Tab-->
         <alertMessageTabNew v-if="from === fromRoute.alertSilence && targetTab === 'alertMessageTab'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="tabs.alertSilence" @changeTab="changeTab" :targetTab.sync="targetTab"></alertMessageTabNew>
+        <!--issue Tab-->
+        <issueTab v-if="from === fromRoute.issue && targetTab === 'issue'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="tabs.alertSilence" @changeTab="changeTab" :targetTab.sync="targetTab"></issueTab>
       </div>
     </div>
   </div>
@@ -75,6 +77,7 @@
 import cabinetTab from './tabs/cabinetTab'
 import alertMessageTab from './tabs/alertMessageTab'
 import alertMessageTabNew from './tabs/alertMessageTabNew'
+import issueTab from './tabs/issueTab'
 import alertRuleEvalLog from './tabs/alertRuleEvalLog'
 import assetSubTab from './tabs/assetSubTab'
 import endpointQuery from './tabs/endpointQuery'
@@ -114,7 +117,8 @@ export default {
     assetSubTab,
     alertRuleEvalLog,
     IpDetails,
-    recordRuleEvalLog
+    recordRuleEvalLog,
+    issueTab
   },
   props: {
     isFullScreen: Boolean, // 是否全屏
@@ -266,6 +270,9 @@ export default {
         ],
         alertSilence: [
           { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: true }
+        ],
+        issue: [
+          { prop: 'issue', name: this.$t('overall.issue'), active: true }
         ]
       }
     }
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/issueTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/issueTab.vue
new file mode 100644
index 000000000..100884036
--- /dev/null
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/issueTab.vue
@@ -0,0 +1,405 @@
+<template>
+  <div>
+ <el-container>
+  <el-container>
+    <el-header >
+        <span>this is a title</span>
+        <div>
+            <ul id="menu">
+                <li>
+                    <i class="nz-icon nz-icon-label"></i>
+                    <div>
+                        <span>{{ this.issuedetailsData.type }}</span>
+                        <span class="describe">Type</span>
+                    </div>
+                </li>
+                  <li>
+                    <i class="nz-icon nz-icon-label"></i>
+                    <div>
+                        <span>{{ priorityEnums(issuedetailsData.priority) }}</span>
+                        <span class="describe">Priority</span>
+                    </div>
+                </li>
+                  <li>
+                    <i class="nz-icon nz-icon-label"></i>
+                    <div>
+                        <span>{{ stateEnums(this.issuedetailsData.state) }}</span>
+                        <span class="describe">state</span>
+                    </div>
+                </li>
+                  <li>
+                    <i class="nz-icon nz-icon-user"></i>
+                    <div>
+                        <span>{{ this.issuedetailsData.reporter.username }}</span>
+                        <span class="describe" >Reporter</span>
+                    </div>
+                </li>
+                  <li>
+                    <i class="nz-icon nz-icon-user"></i>
+                    <div>
+                        <span>{{ this.issuedetailsData.assignee.username }}</span>
+                        <span class="describe">Assignee</span>
+                    </div>
+                </li>
+            </ul>
+        </div>
+    </el-header>
+    <el-main>
+           <div>
+            <span class="description" >
+                <i class="nz-icon nz-icon-arrow-right fold" v-if="foldShow" @click="foldFun"></i>
+                <i class="nz-icon nz-icon-arrow-down  open" v-if="openShow" @click="openFun"></i>
+            </span>
+            <span class="description-title">Description</span>
+            <div class="description-content"  v-if="openShow" v-html="this.contents">
+            </div>
+           </div>
+              <div class="relate-assets-box">
+            <span class="relate-assets" >
+                <i class="nz-icon nz-icon-arrow-right fold" v-if="assetsfoldShow" @click="assetsfoldFun"></i>
+                <i class="nz-icon nz-icon-arrow-down  open" v-if="assetsopenShow" @click="assetsopenFun"></i>
+            </span>
+            <span class="relate-assets-title">Relate-assets</span>
+            <div class="relate-assets-content"  v-if="assetsopenShow "  >
+                 <div v-for="(item, index) in this.assets" :key="index"  >{{item.name}}</div>
+            </div>
+           </div>
+    </el-main>
+    <!-- <el-footer>Footer</el-footer> -->
+  </el-container>
+    <el-aside width="400px" class="aside-box">
+        <span>动态</span>
+        <template>
+                <el-tabs v-model="activeName" @tab-click="handleClick">
+                    <el-tab-pane label="全部" name="first">
+                        <div class="change ">
+                            <i class="nz-icon nz-icon-edit"></i>
+                            <span>老王 Created issue {{this.time}}</span>
+                             <!-- <div v-for="(item, index) in changeData" :key="index" v-html="item.content" ></div> -->
+                        </div>
+                        <div class="content first-content">
+                               <i class="nz-icon nz-icon-edit"></i>
+                            <span>老王 Add comment {{this.time}}</span>
+                               <div class="content-data" v-for="(item, index) in contentData" :key="index" v-html="item.content" ></div>
+                        </div>
+                    </el-tab-pane>
+                    <el-tab-pane label="评论" name="content">
+                        <div class="content">
+                               <i class="nz-icon nz-icon-edit"></i>
+                            <span>老王 Add comment {{this.time}}</span>
+                            <div class="content-data" v-for="(item, index) in contentData" :key="index" v-html="item.content" ></div>
+                        </div>
+                    </el-tab-pane>
+                    <el-tab-pane label="变更记录" name="change">
+                        <div class="change">
+                            <i class="nz-icon nz-icon-edit"></i>
+                            <span>老王 Created issue {{this.time}}</span>
+                            <!-- <div  v-html="this.changeData" ></div> -->
+                        </div>
+                    </el-tab-pane>
+                </el-tabs>
+        </template>
+         <el-footer class="footer-box">
+            <div class="add-comment-btn">
+            <el-button type="text" v-if="addcommentShow"  @click="addcommentBtn">Add comment</el-button>
+
+             <div v-if="textareaShow" class="textareas">
+                <el-input
+                type="textarea"
+                :autosize="{ minRows: 2, maxRows: 4}"
+                placeholder="多行输入"
+                v-model="textarea">
+                </el-input>
+               <div class="btn-box">
+                 <el-button size="mini" @click="addFun">Add</el-button>
+                <el-button size="mini" @click="cancelBtn">Cancel</el-button>
+               </div>
+             </div>
+        </div>
+        </el-footer>
+    </el-aside>
+</el-container>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'issueTab',
+  data () {
+    return {
+      url: '/issue',
+      activeName: 'first',
+      textareaShow: false, // 底部输入框显示状态
+      addcommentShow: true, // 底部按钮显示状态
+      openShow: false, // 展开折叠图标显示状态
+      foldShow: true, // 展开折叠图标显示状态
+      assetsopenShow: false, // 展开折叠图标显示状态
+      assetsfoldShow: true, // 展开折叠图标显示状态
+      textarea: '', // 底部输入框内容
+      issuedetailsData: [], // issue详情data
+      changeData: [], // 变更data
+      contentData: [], // 评论data
+      assets: [],
+      contents: [],
+      time: '',
+      defaultProps: {
+        children: 'children',
+        label: 'label'
+      }
+    }
+  },
+  created () {
+    this.axiosss()
+  },
+  methods: {
+    handleNodeClick (data) {
+      console.log(data)
+    },
+    handleClick (tab, event) {
+      console.log(tab, event)
+    },
+    addcommentBtn () {
+      this.textareaShow = true
+      this.addcommentShow = false
+    },
+    cancelBtn () {
+      this.textareaShow = false
+      this.addcommentShow = true
+    },
+    // 处理后台返回的html特殊标签   ----已经弃用 之前有插件处理
+    delHtmlTag (str) {
+      return str.replace(/<[^>]+>/g, '').replace(/&nbsp;/ig, '')
+    },
+    addFun () {
+      const params = {
+        issueId: 1,
+        content: this.textarea
+      }
+      this.$post('/issue/activity', params).then(response => { // 问题动态 新增
+        if (response.code === 200) {
+        //   console.log(response, 1)
+          this.axiosss()
+        }
+      })
+    },
+    axiosss () {
+      this.$get(`${this.url}/${1}`).then(response => { // issue详情接口
+        if (response.code === 200) {
+          this.issuedetailsData = response.data
+          this.contents = this.issuedetailsData.content
+          this.assets = this.issuedetailsData.assets
+          //   console.log(this.issuedetailsData, 3)
+        }
+      })
+      this.$get(`${this.url}/activity?issueId=1&type=1&pageSize=-1`).then(response => { // issue动态详情接口-变更记录
+        if (response.code === 200) {
+          this.changeData = response.data.list
+          this.time = response.time
+          console.log(response.time)
+        //   console.log(this.changeData, 1)
+        //   console.log(response.data, 2)
+        }
+      })
+      this.$get(`${this.url}/activity?issueId=1&type=2&pageSize=-1`).then(response => { // issue动态详情接口-评论
+        if (response.code === 200) {
+          this.contentData = response.data.list
+        //   console.log(this.contentData, 2)
+        }
+      })
+    },
+    // priority 枚举转换
+    priorityEnums (data) {
+      if (data == 1) {
+        data = '高'
+      } else if (data == 2) {
+        data = '中'
+      } else {
+        data = '低'
+      }
+      return data
+    },
+    // state 枚举转换
+    stateEnums (data) {
+      if (data == 1) {
+        data = '打开'
+      } else if (data == 2) {
+        data = '已指派'
+      } else if (data == 3) {
+        data = '处理中'
+      } else if (data == 4) {
+        data = '挂起'
+      } else if (data == 5) {
+        data = '已解决'
+      } else if (data == 6) {
+        data = '关闭'
+      } else if (data == 7) {
+        data = '取消'
+      }
+      return data
+    },
+    foldFun () {
+      this.openShow = true
+      this.foldShow = false
+    },
+    openFun () {
+      this.openShow = false
+      this.foldShow = true
+    },
+    assetsfoldFun () {
+      this.assetsopenShow = true
+      this.assetsfoldShow = false
+    },
+    assetsopenFun () {
+      this.assetsopenShow = false
+      this.assetsfoldShow = true
+    }
+  }
+}
+</script>
+
+<style>
+ #menu {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  flex-wrap: wrap;
+ }
+ #menu li {
+  display: flex;
+  flex-wrap: wrap;
+  width: 200px;
+  height: 80px;
+  margin-top: 40px;
+  position: relative;
+ }
+ #menu li i{
+    font-size: 40px;
+    margin-right: 10px;
+ }
+ #menu li .describe {
+    position: absolute;
+    bottom: 40px;
+    right: 100px;
+    width: 50px;
+    /* color: $--color-text-regular; */
+ }
+  #menu li i,div{
+  line-height: 100%;
+ }
+ .theme-light  .el-header{
+    height: 150px !important;
+    padding: 20px !important;
+  }
+
+  .theme-light  .el-aside {
+    height: 630px !important;
+     padding: 20px !important;
+  }
+
+ .theme-light  .el-main {
+    height: 480px !important;
+     padding: 20px !important;
+  }
+  body > .el-container {
+    margin-bottom: 40px;
+  }
+
+  .el-container:nth-child(5) .el-aside,
+  .el-container:nth-child(6) .el-aside {
+    line-height: 260px;
+  }
+
+  .el-container:nth-child(7) .el-aside {
+    line-height: 320px;
+  }
+  .el-tabs {
+    margin-top: 20px !important;
+  }
+  .footer-box{
+    position: relative;
+    height: 130px !important;
+  }
+  .add-comment-btn{
+    position: absolute;
+    bottom: 0px;
+    left: 0px;
+    /* border: rgba(180, 176, 176, 0.847) 1px solid; */
+    width: 395px;
+    height: 40px;
+    line-height: 100%;
+  }
+.theme-light .el-button--text{
+    margin-left: 15px !important;
+  }
+  .textareas{
+    width: 395px;
+    position: absolute;
+    bottom: 50px;
+    left: 0px;
+  }
+  .btn-box{
+    position: absolute;
+    /* bottom: -40px; */
+    right: 45px;
+  }
+  .description{
+    position: relative;
+    line-height: 100%;
+  }
+ .description i {
+    position: absolute;
+    top: 0px;
+    left: 0px;
+    cursor:pointer;/*鼠标变小手*/
+    border: 1px solid;
+}
+.description-title {
+    margin-left: 20px;
+}
+.description-content {
+    margin-left: 20px;
+    margin-top: 12px;
+    white-space:pre-wrap;
+}
+.relate-assets-box {
+    margin-top: 20px;
+}
+.relate-assets{
+     position: relative;
+    line-height: 100%;
+}
+.relate-assets i {
+    position: absolute;
+    top: 0px;
+    left: 0px;
+    cursor:pointer;/*鼠标变小手*/
+    border: 1px solid;
+}
+.relate-assets-title {
+    margin-left: 20px;
+}
+.relate-assets-content {
+    margin-left: 20px;
+    margin-top: 12px;
+}
+.relate-assets-content div{
+    margin-top: 12px;
+}
+.content-data{
+    margin-top: 10px;
+    margin-left: 20px;
+}
+.first-content{
+    border-bottom: 1px solid;
+    border-top: 1px solid;
+    margin-top: 20px;
+    padding-top: 10px;
+    padding-bottom: 10px;
+}
+.ql-container.ql-snow{
+    border: 0 !important;
+}
+.theme-light .el-textarea{
+    width: 350px !important;
+}
+</style>
diff --git a/nezha-fronted/src/components/common/table/settings/issueTable.vue b/nezha-fronted/src/components/common/table/settings/issueTable.vue
index b33319034..4e1aa6859 100644
--- a/nezha-fronted/src/components/common/table/settings/issueTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/issueTable.vue
@@ -95,7 +95,7 @@
         {{ $t("overall.option") }}
       </div>
       <div slot-scope="scope" class="table-operation-items">
-        <button class="table-operation-item" @click="showBottomBox('recordRule', scope.row)" :title="$t('overall.view')"><i class="nz-icon nz-icon-view1"></i></button>
+        <button class="table-operation-item" @click="showBottomBox('issue', scope.row)" :title="$t('overall.view')"><i class="nz-icon nz-icon-view1"></i></button>
         <el-dropdown size="medium" v-has="['record_rule_edit','record_rule_delete']" trigger="click" @command="tableOperation">
           <div class="table-operation-item table-operation-item--more" :title="$t('overall.moreOperations')">
             <i class="nz-icon nz-icon-more3"></i>

From 39a48206970a398d4c072f751fec35b1d4de71f6 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 31 Aug 2022 10:46:40 +0800
Subject: [PATCH 03/37] =?UTF-8?q?fix=EF=BC=9A=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/build/webpack.dev.conf.js  |  6 +++++-
 nezha-fronted/build/webpack.prod.conf.js |  3 ++-
 nezha-fronted/config/index.js            |  7 +++++++
 nezha-fronted/src/entrance/app/App.vue   | 11 ++++++-----
 nezha-fronted/src/router/index.js        |  4 ++++
 5 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/nezha-fronted/build/webpack.dev.conf.js b/nezha-fronted/build/webpack.dev.conf.js
index ed7f7cd31..fdc5b0e87 100644
--- a/nezha-fronted/build/webpack.dev.conf.js
+++ b/nezha-fronted/build/webpack.dev.conf.js
@@ -26,8 +26,12 @@ devWebpackConfig = merge(baseWebpackConfig, {
   devServer: {
     clientLogLevel: 'warning',
     historyApiFallback: {
+      index: indexHtml,
       rewrites: [
-        { from: /.*/, to: path.posix.join(config.dev.assetsPublicPath, indexHtml) }
+        {
+          from: /.*/g,
+          to: '/ui/'
+        }
       ]
     },
     hot: true,
diff --git a/nezha-fronted/build/webpack.prod.conf.js b/nezha-fronted/build/webpack.prod.conf.js
index aee6b4268..1f159c4f3 100644
--- a/nezha-fronted/build/webpack.prod.conf.js
+++ b/nezha-fronted/build/webpack.prod.conf.js
@@ -190,7 +190,8 @@ if (arg === 'html') {
     output: {
       path: config.build.assetsRoot,
       filename: utils.assetsPath('js/[name].[chunkhash].js'),
-      chunkFilename: utils.assetsPath('js/[name].[chunkhash].js')
+      chunkFilename: utils.assetsPath('js/[name].[chunkhash].js'),
+      publicPath: '/'
     },
     plugins: [
       /* new GenerateAssetPlugin({
diff --git a/nezha-fronted/config/index.js b/nezha-fronted/config/index.js
index 4215b1ba8..ce7a6fd73 100644
--- a/nezha-fronted/config/index.js
+++ b/nezha-fronted/config/index.js
@@ -16,6 +16,13 @@ module.exports = {
         pathRewrite: {
           '^/apis': '/' // 这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
         }
+      },
+      '/ui': {
+        target: '/', // 设置调用接口域名和端口号别忘了加http
+        changeOrigin: true,
+        pathRewrite: {
+          '^/ui': '/' // 这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
+        }
       }
     },
     // Various Dev Server settings
diff --git a/nezha-fronted/src/entrance/app/App.vue b/nezha-fronted/src/entrance/app/App.vue
index 9949d28d3..e995500be 100644
--- a/nezha-fronted/src/entrance/app/App.vue
+++ b/nezha-fronted/src/entrance/app/App.vue
@@ -16,12 +16,13 @@ export default {
   },
   async created () {
     const herfSpiltArr = window.location.href.split('/')
-    if (herfSpiltArr[3] !== '#') {
-      herfSpiltArr[3] = '#'
-      window.location.href = herfSpiltArr.join('/')
-    }
+    // if (herfSpiltArr[3] !== '#') {
+    //   herfSpiltArr[3] = '#'
+    //   window.location.href = herfSpiltArr.join('/')
+    // }
     const Timestamp = new Date().getTime()
-    const url = 'static/config.json?Timestamp=' + Timestamp
+    const url = '/static/config.json?Timestamp=' + Timestamp
+    console.log(url)
     const result = await this.$http.get(url) // 获取本地的config.json 判断是否需要清空localStorage 以及设备的宽 和 axios的baseUrl
     this.$axios.defaults.baseURL = result.body.baseUrl
     const version = result.body.version
diff --git a/nezha-fronted/src/router/index.js b/nezha-fronted/src/router/index.js
index 6273f44b3..d8f39c453 100644
--- a/nezha-fronted/src/router/index.js
+++ b/nezha-fronted/src/router/index.js
@@ -2,6 +2,10 @@ import Vue from 'vue'
 import Router from 'vue-router'
 Vue.use(Router)
 export default new Router({
+  hashbang: false,
+  history: true,
+  mode: 'history',
+  base: '/ui/',
   routes: [
     {
       path: '/',

From d545fcd411fe0953220722cd7aa325ec3b096299 Mon Sep 17 00:00:00 2001
From: wenzhijie <wenzhijie@geedgenetworks.com>
Date: Wed, 31 Aug 2022 16:59:54 +0800
Subject: [PATCH 04/37] =?UTF-8?q?NEZ-2153=20feat:=20Task=20issue=20?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/bottomBox/issueTab.scss | 134 ++++++++++++
 .../src/assets/css/components/index.scss      |   1 +
 .../common/bottomBox/tabs/issueTab.vue        | 204 +++---------------
 3 files changed, 163 insertions(+), 176 deletions(-)
 create mode 100644 nezha-fronted/src/assets/css/components/common/bottomBox/issueTab.scss

diff --git a/nezha-fronted/src/assets/css/components/common/bottomBox/issueTab.scss b/nezha-fronted/src/assets/css/components/common/bottomBox/issueTab.scss
new file mode 100644
index 000000000..9eb6e6568
--- /dev/null
+++ b/nezha-fronted/src/assets/css/components/common/bottomBox/issueTab.scss
@@ -0,0 +1,134 @@
+#menu {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    flex-wrap: wrap;
+   }
+   #menu .menu-li {
+    display: flex;
+    flex-wrap: wrap;
+    width: 200px;
+    height: 90px;
+    margin-top: 40px;
+    position: relative;
+   }
+   #menu .menu-li .menu-i{
+      font-size: 40px;
+      margin-right: 10px;
+   }
+   #menu .menu-li .describe {
+      position: absolute;
+      bottom: 40px;
+      right: 100px;
+      width: 50px;
+      color: $--color-text-secondary;
+   }
+    /* #menu .menu-li .menu-i,div{
+    line-height: 100%;
+   } */
+   .issuetab-header{
+      height: 150px !important;
+      padding: 20px !important;
+      border-top: 1px solid $--border-color-light;
+      border-bottom: 1px solid $--border-color-light;
+      border-left:1px solid $--border-color-light;
+      .title{
+        color: $--color-text-primary;
+      }
+    }
+    .issuetab-aside{
+      position: relative;
+      height: 630px !important;
+      padding: 20px !important;
+      border: 1px solid $--border-color-light;
+      .add-comment-btn{
+        position: absolute;
+        left: 0;
+        bottom: 0;
+        border: 1px solid $--border-color-light;
+        width: 370px;
+        padding-left: 20px;
+        color: $--color-text-regular;
+      }
+    }
+    .issuetab-main {
+      height: 480px !important;
+       padding: 20px !important;
+       border-left: 1px solid $--border-color-light;
+       border-bottom:1px solid $--border-color-light;
+    }
+    .issuetab-eltabs {
+      margin-top: 20px !important;
+      height: 400px;
+       /* height:90%; */
+      overflow-y:auto;
+      overflow-x:hidden
+    }
+   /* .issuetab-eltabs .tab-pane{
+    } */
+    .textareas{
+      background: pink;
+      width: 390px;
+      position: absolute;
+      bottom: 35px;
+      left: 0;
+      border: 1px solid $--border-color-light;
+    }
+    .btn-box{
+      position: absolute;
+      /* bottom: -40px; */
+      right: 0;
+    }
+    .description{
+      position: relative;
+      line-height: 100%;
+    }
+   .description .fold, .open {
+      position: absolute;
+      top: 0px;
+      left: 0px;
+      cursor:pointer;/*鼠标变小手*/
+      border: 1px solid ;
+  }
+  .description-title {
+      margin-left: 20px;
+  }
+  .description-content {
+      margin-left: 20px;
+      margin-top: 12px;
+      white-space:pre-wrap;
+  }
+  .relate-assets-box {
+      margin-top: 20px;
+  }
+  .relate-assets{
+       position: relative;
+      line-height: 100%;
+  }
+  .relate-assets .fold, .open {
+      position: absolute;
+      top: 0px;
+      left: 0px;
+      cursor:pointer;/*鼠标变小手*/
+      border: 1px solid ;
+  }
+  .relate-assets-title {
+      margin-left: 20px;
+  }
+  .relate-assets-content {
+      margin-left: 20px;
+      margin-top: 12px;
+  }
+  .content-data{
+      margin-top: 10px;
+      margin-left: 20px;
+  }
+  .first-content{
+      border-bottom: 1px solid $--border-color-light;
+      border-top: 1px solid $--border-color-light;
+      margin-top: 20px;
+      padding-top: 10px;
+      padding-bottom: 10px;
+  }
+
+  
\ No newline at end of file
diff --git a/nezha-fronted/src/assets/css/components/index.scss b/nezha-fronted/src/assets/css/components/index.scss
index 1a5a41667..f3c538ab2 100644
--- a/nezha-fronted/src/assets/css/components/index.scss
+++ b/nezha-fronted/src/assets/css/components/index.scss
@@ -10,6 +10,7 @@
 @import './common/alert/alertDaysInfo.scss';
 @import './common/bottomBox/bottomBox.scss';
 @import './common/bottomBox/panelTabNew.scss';
+@import './common/bottomBox/issueTab.scss';
 @import './common/bottomBox/terminalLogCMDTab.scss';
 @import './common/bottomBox/terminalLogMonitorTab.scss';
 @import './common/bottomBox/terminalLogRecordTab.scss';
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/issueTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/issueTab.vue
index 100884036..97f2c56e8 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/issueTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/issueTab.vue
@@ -1,42 +1,42 @@
 <template>
   <div>
  <el-container>
-  <el-container>
-    <el-header >
-        <span>this is a title</span>
+  <el-container class="issuetab-container">
+    <el-header class="issuetab-header">
+        <span class="title">this is a title</span>
         <div>
             <ul id="menu">
-                <li>
-                    <i class="nz-icon nz-icon-label"></i>
-                    <div>
+                <li class="menu-li">
+                    <i class="nz-icon nz-icon-label menu-i"></i>
+                    <div class="menu-div">
                         <span>{{ this.issuedetailsData.type }}</span>
                         <span class="describe">Type</span>
                     </div>
                 </li>
-                  <li>
-                    <i class="nz-icon nz-icon-label"></i>
-                    <div>
+                  <li class="menu-li">
+                    <i class="nz-icon nz-icon-label menu-i"></i>
+                    <div class="menu-div">
                         <span>{{ priorityEnums(issuedetailsData.priority) }}</span>
                         <span class="describe">Priority</span>
                     </div>
                 </li>
-                  <li>
-                    <i class="nz-icon nz-icon-label"></i>
-                    <div>
+                  <li class="menu-li">
+                    <i class="nz-icon nz-icon-label menu-i"></i>
+                    <div class="menu-div">
                         <span>{{ stateEnums(this.issuedetailsData.state) }}</span>
                         <span class="describe">state</span>
                     </div>
                 </li>
-                  <li>
-                    <i class="nz-icon nz-icon-user"></i>
-                    <div>
+                  <li class="menu-li">
+                    <i class="nz-icon nz-icon-user menu-i"></i>
+                    <div class="menu-div">
                         <span>{{ this.issuedetailsData.reporter.username }}</span>
                         <span class="describe" >Reporter</span>
                     </div>
                 </li>
-                  <li>
-                    <i class="nz-icon nz-icon-user"></i>
-                    <div>
+                  <li class="menu-li">
+                    <i class="nz-icon nz-icon-user menu-i"></i>
+                    <div class="menu-div">
                         <span>{{ this.issuedetailsData.assignee.username }}</span>
                         <span class="describe">Assignee</span>
                     </div>
@@ -44,7 +44,7 @@
             </ul>
         </div>
     </el-header>
-    <el-main>
+    <el-main class="issuetab-main">
            <div>
             <span class="description" >
                 <i class="nz-icon nz-icon-arrow-right fold" v-if="foldShow" @click="foldFun"></i>
@@ -67,11 +67,11 @@
     </el-main>
     <!-- <el-footer>Footer</el-footer> -->
   </el-container>
-    <el-aside width="400px" class="aside-box">
+    <el-aside width="400px" class="issuetab-aside">
         <span>动态</span>
         <template>
-                <el-tabs v-model="activeName" @tab-click="handleClick">
-                    <el-tab-pane label="全部" name="first">
+                <el-tabs v-model="activeName" @tab-click="handleClick" class="issuetab-eltabs">
+                    <el-tab-pane label="全部" name="first" class="tab-pane">
                         <div class="change ">
                             <i class="nz-icon nz-icon-edit"></i>
                             <span>老王 Created issue {{this.time}}</span>
@@ -83,14 +83,14 @@
                                <div class="content-data" v-for="(item, index) in contentData" :key="index" v-html="item.content" ></div>
                         </div>
                     </el-tab-pane>
-                    <el-tab-pane label="评论" name="content">
+                    <el-tab-pane label="评论" name="content" class="tab-pane">
                         <div class="content">
                                <i class="nz-icon nz-icon-edit"></i>
                             <span>老王 Add comment {{this.time}}</span>
                             <div class="content-data" v-for="(item, index) in contentData" :key="index" v-html="item.content" ></div>
                         </div>
                     </el-tab-pane>
-                    <el-tab-pane label="变更记录" name="change">
+                    <el-tab-pane label="变更记录" name="change" class="tab-pane">
                         <div class="change">
                             <i class="nz-icon nz-icon-edit"></i>
                             <span>老王 Created issue {{this.time}}</span>
@@ -99,12 +99,13 @@
                     </el-tab-pane>
                 </el-tabs>
         </template>
-         <el-footer class="footer-box">
-            <div class="add-comment-btn">
-            <el-button type="text" v-if="addcommentShow"  @click="addcommentBtn">Add comment</el-button>
+         <div class="add-comment-btn">
+              <el-button type="text" v-if="addcommentShow"  @click="addcommentBtn">Add comment</el-button>
+            </div>
 
              <div v-if="textareaShow" class="textareas">
                 <el-input
+                class="textareas-input"
                 type="textarea"
                 :autosize="{ minRows: 2, maxRows: 4}"
                 placeholder="多行输入"
@@ -115,8 +116,6 @@
                 <el-button size="mini" @click="cancelBtn">Cancel</el-button>
                </div>
              </div>
-        </div>
-        </el-footer>
     </el-aside>
 </el-container>
   </div>
@@ -256,150 +255,3 @@ export default {
   }
 }
 </script>
-
-<style>
- #menu {
-  display: flex;
-  justify-content: space-around;
-  align-items: center;
-  flex-wrap: wrap;
- }
- #menu li {
-  display: flex;
-  flex-wrap: wrap;
-  width: 200px;
-  height: 80px;
-  margin-top: 40px;
-  position: relative;
- }
- #menu li i{
-    font-size: 40px;
-    margin-right: 10px;
- }
- #menu li .describe {
-    position: absolute;
-    bottom: 40px;
-    right: 100px;
-    width: 50px;
-    /* color: $--color-text-regular; */
- }
-  #menu li i,div{
-  line-height: 100%;
- }
- .theme-light  .el-header{
-    height: 150px !important;
-    padding: 20px !important;
-  }
-
-  .theme-light  .el-aside {
-    height: 630px !important;
-     padding: 20px !important;
-  }
-
- .theme-light  .el-main {
-    height: 480px !important;
-     padding: 20px !important;
-  }
-  body > .el-container {
-    margin-bottom: 40px;
-  }
-
-  .el-container:nth-child(5) .el-aside,
-  .el-container:nth-child(6) .el-aside {
-    line-height: 260px;
-  }
-
-  .el-container:nth-child(7) .el-aside {
-    line-height: 320px;
-  }
-  .el-tabs {
-    margin-top: 20px !important;
-  }
-  .footer-box{
-    position: relative;
-    height: 130px !important;
-  }
-  .add-comment-btn{
-    position: absolute;
-    bottom: 0px;
-    left: 0px;
-    /* border: rgba(180, 176, 176, 0.847) 1px solid; */
-    width: 395px;
-    height: 40px;
-    line-height: 100%;
-  }
-.theme-light .el-button--text{
-    margin-left: 15px !important;
-  }
-  .textareas{
-    width: 395px;
-    position: absolute;
-    bottom: 50px;
-    left: 0px;
-  }
-  .btn-box{
-    position: absolute;
-    /* bottom: -40px; */
-    right: 45px;
-  }
-  .description{
-    position: relative;
-    line-height: 100%;
-  }
- .description i {
-    position: absolute;
-    top: 0px;
-    left: 0px;
-    cursor:pointer;/*鼠标变小手*/
-    border: 1px solid;
-}
-.description-title {
-    margin-left: 20px;
-}
-.description-content {
-    margin-left: 20px;
-    margin-top: 12px;
-    white-space:pre-wrap;
-}
-.relate-assets-box {
-    margin-top: 20px;
-}
-.relate-assets{
-     position: relative;
-    line-height: 100%;
-}
-.relate-assets i {
-    position: absolute;
-    top: 0px;
-    left: 0px;
-    cursor:pointer;/*鼠标变小手*/
-    border: 1px solid;
-}
-.relate-assets-title {
-    margin-left: 20px;
-}
-.relate-assets-content {
-    margin-left: 20px;
-    margin-top: 12px;
-}
-.relate-assets-content div{
-    margin-top: 12px;
-}
-.content-data{
-    margin-top: 10px;
-    margin-left: 20px;
-}
-.first-content{
-    border-bottom: 1px solid;
-    border-top: 1px solid;
-    margin-top: 20px;
-    padding-top: 10px;
-    padding-bottom: 10px;
-}
-.ql-container.ql-snow{
-    border: 0 !important;
-}
-.theme-light .el-textarea{
-    width: 350px !important;
-}
-</style>

From 68f661f548a930144791ec340a3781d02fb40039 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 1 Sep 2022 14:05:21 +0800
Subject: [PATCH 05/37] =?UTF-8?q?fix=EF=BC=9A=20=E4=BF=AE=E5=A4=8D=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E7=94=B1=E6=A8=A1=E5=BC=8F=E5=90=8E?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=20=E8=B7=B3=E8=BD=AC=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/http.js       | 5 +++++
 nezha-fronted/src/permission.js | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/http.js b/nezha-fronted/src/http.js
index 080017e18..ee835a5b1 100644
--- a/nezha-fronted/src/http.js
+++ b/nezha-fronted/src/http.js
@@ -75,6 +75,10 @@ axios.interceptors.request.use(
 )
 axios.interceptors.response.use(
   response => {
+    if (response.config.url.indexOf('ui') !== -1) {
+      removePending(response.config)
+      return response
+    }
     if (licenceErrorCode.indexOf(response.data.code) !== -1 && noJumpPath.indexOf(window.location.hash) == -1) {
       window.location.href = '/'
     } else if (response.status === 200) {
@@ -82,6 +86,7 @@ axios.interceptors.response.use(
         window.location.href = '/'
       }
     } else {
+      removePending(response.config)
       return response
     }
     // 请求完成在数组中移除
diff --git a/nezha-fronted/src/permission.js b/nezha-fronted/src/permission.js
index f0c9e3ee4..58c61a525 100644
--- a/nezha-fronted/src/permission.js
+++ b/nezha-fronted/src/permission.js
@@ -19,7 +19,7 @@ router.beforeEach((to, from, next) => {
     requestsArr.forEach(xhr => xhr.cancel('cancel'))
   }
   store.commit('setNowPath', to.path)
-  const configUrl = 'static/config.json?Timestamp=' + new Date().getTime()
+  const configUrl = '/static/config.json?Timestamp=' + new Date().getTime()
   if (to.path === '/login') { // 拦截登录页面，现货区外观设置 再系统初始化检查
     Vue.http.get(configUrl).then(config => {
       const appearance = new Promise(resolve => {

From 74782f319e5db9d3f797f0b9eb3b6ddda2368a8e Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 2 Sep 2022 14:32:26 +0800
Subject: [PATCH 06/37] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=9C=AC?=
 =?UTF-8?q?=E5=9C=B0=E5=88=B7=E6=96=B0=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/build/webpack.dev.conf.js | 5 +----
 nezha-fronted/config/index.js           | 7 -------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/nezha-fronted/build/webpack.dev.conf.js b/nezha-fronted/build/webpack.dev.conf.js
index fdc5b0e87..ede01b850 100644
--- a/nezha-fronted/build/webpack.dev.conf.js
+++ b/nezha-fronted/build/webpack.dev.conf.js
@@ -28,10 +28,7 @@ devWebpackConfig = merge(baseWebpackConfig, {
     historyApiFallback: {
       index: indexHtml,
       rewrites: [
-        {
-          from: /.*/g,
-          to: '/ui/'
-        }
+        { from: /.*/, to: path.posix.join(config.dev.assetsPublicPath, indexHtml) }
       ]
     },
     hot: true,
diff --git a/nezha-fronted/config/index.js b/nezha-fronted/config/index.js
index ce7a6fd73..4215b1ba8 100644
--- a/nezha-fronted/config/index.js
+++ b/nezha-fronted/config/index.js
@@ -16,13 +16,6 @@ module.exports = {
         pathRewrite: {
           '^/apis': '/' // 这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
         }
-      },
-      '/ui': {
-        target: '/', // 设置调用接口域名和端口号别忘了加http
-        changeOrigin: true,
-        pathRewrite: {
-          '^/ui': '/' // 这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
-        }
       }
     },
     // Various Dev Server settings

From 3f3ce50513e0f2afc70bef478174e250b23b3f2e Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 2 Sep 2022 15:43:59 +0800
Subject: [PATCH 07/37] =?UTF-8?q?style=EF=BC=9A=E4=BF=AE=E5=A4=8D=20=20ass?=
 =?UTF-8?q?etMetaBox=20=E9=BB=91=E8=89=B2=E6=A0=B7=E5=BC=8F=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../css/components/common/rightBox/assetMetaBox.scss     | 9 +++++++++
 nezha-fronted/src/assets/css/components/index.scss       | 1 +
 .../src/components/common/rightBox/assetMetaBox.vue      | 6 ------
 3 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 nezha-fronted/src/assets/css/components/common/rightBox/assetMetaBox.scss

diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/assetMetaBox.scss b/nezha-fronted/src/assets/css/components/common/rightBox/assetMetaBox.scss
new file mode 100644
index 000000000..00dac6207
--- /dev/null
+++ b/nezha-fronted/src/assets/css/components/common/rightBox/assetMetaBox.scss
@@ -0,0 +1,9 @@
+.right-box-asset-meta{
+  .datetime-header{
+    display: inline-block;
+    width: 80px;
+    margin-right: 10px;
+    text-align: right;
+    color: $--color-text-regular;
+  }
+}
diff --git a/nezha-fronted/src/assets/css/components/index.scss b/nezha-fronted/src/assets/css/components/index.scss
index f3c538ab2..e6b5162c1 100644
--- a/nezha-fronted/src/assets/css/components/index.scss
+++ b/nezha-fronted/src/assets/css/components/index.scss
@@ -52,6 +52,7 @@
 @import './common/rightBox/menuBox.scss';
 @import './common/rightBox/moduleBox.scss';
 @import './common/rightBox/ipam.scss';
+@import './common/rightBox/assetMetaBox.scss';
 @import './common/rightBox/chartRightBox/chartRightBox.scss';
 @import './common/rightBox/mibBox.scss';
 @import './common/rightBox/assetBactchEditBox.scss';
diff --git a/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue b/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue
index f3535bf26..9dbca0e5d 100644
--- a/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue
@@ -490,10 +490,4 @@ export default {
   .meta-option-box{
 
   }
-  .datetime-header{
-    display: inline-block;
-    width: 80px;
-    margin-right: 10px;
-    text-align: right;
-  }
 </style>

From f36a73c9ef2814c63dffa9cdb766a92df2a72eaa Mon Sep 17 00:00:00 2001
From: wenzhijie <wenzhijie@geedgenetworks.com>
Date: Fri, 2 Sep 2022 17:20:52 +0800
Subject: [PATCH 08/37] =?UTF-8?q?fix=EF=BC=9A=E8=A1=A5=E5=85=85issue?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E7=BC=BA=E5=B0=91=E7=9A=84?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/bottomBox/tabs/issueTab.vue        | 64 +++++++++++++------
 1 file changed, 44 insertions(+), 20 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/issueTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/issueTab.vue
index 97f2c56e8..7404e3f56 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/issueTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/issueTab.vue
@@ -68,39 +68,50 @@
     <!-- <el-footer>Footer</el-footer> -->
   </el-container>
     <el-aside width="400px" class="issuetab-aside">
-        <span>动态</span>
+        <span>{{$t("issueTab.dynamic")}} </span>
         <template>
                 <el-tabs v-model="activeName" @tab-click="handleClick" class="issuetab-eltabs">
-                    <el-tab-pane label="全部" name="first" class="tab-pane">
+                    <el-tab-pane :label="$t('issueTab.whole')" name="first" class="tab-pane">
                         <div class="change ">
                             <i class="nz-icon nz-icon-edit"></i>
-                            <span>老王 Created issue {{this.time}}</span>
+                            <span>老王</span>
+                            <span>Created issue</span>
+                            <span>2022-09-02</span>
                              <!-- <div v-for="(item, index) in changeData" :key="index" v-html="item.content" ></div> -->
                         </div>
-                        <div class="content first-content">
-                               <i class="nz-icon nz-icon-edit"></i>
-                            <span>老王 Add comment {{this.time}}</span>
-                               <div class="content-data" v-for="(item, index) in contentData" :key="index" v-html="item.content" ></div>
+                        <div class="content first-content" >
+                               <div v-for="(item, index) in this.contentData" :key="index">
+                                <i class="nz-icon nz-icon-edit"></i>
+                                <span>{{item.createUser.name}}</span>
+                                <span>{{typeEnums(item.type)}}</span>
+                                <span>{{timezoneToUtcTimeStr(item.cts)}}</span>
+                                <div class="content-data" v-for="(item, index) in contentData" :key="index" v-html="item.content" ></div>
+                                </div>
                         </div>
                     </el-tab-pane>
-                    <el-tab-pane label="评论" name="content" class="tab-pane">
-                        <div class="content">
-                               <i class="nz-icon nz-icon-edit"></i>
-                            <span>老王 Add comment {{this.time}}</span>
-                            <div class="content-data" v-for="(item, index) in contentData" :key="index" v-html="item.content" ></div>
+                    <el-tab-pane :label="$t('issueTab.comment')"  name="content" class="tab-pane">
+                        <div class="content " >
+                               <div v-for="(item, index) in this.contentData" :key="index">
+                                <i class="nz-icon nz-icon-edit"></i>
+                                <span>{{item.createUser.name}}</span>
+                                <span>{{typeEnums(item.type)}}</span>
+                                <span>{{timezoneToUtcTimeStr(item.cts)}}</span>
+                                <div class="content-data" v-for="(item, index) in contentData" :key="index" v-html="item.content" ></div>
+                                </div>
                         </div>
                     </el-tab-pane>
-                    <el-tab-pane label="变更记录" name="change" class="tab-pane">
+                    <el-tab-pane :label="$t('issueTab.changeRecord')"  name="change" class="tab-pane">
                         <div class="change">
                             <i class="nz-icon nz-icon-edit"></i>
-                            <span>老王 Created issue {{this.time}}</span>
-                            <!-- <div  v-html="this.changeData" ></div> -->
+                            <span>老王</span>
+                            <span>Created issue</span>
+                            <span>2022-09-02</span>
                         </div>
                     </el-tab-pane>
                 </el-tabs>
         </template>
          <div class="add-comment-btn">
-              <el-button type="text" v-if="addcommentShow"  @click="addcommentBtn">Add comment</el-button>
+              <el-button type="text" v-if="addcommentShow"  @click="addcommentBtn">{{$t("issueTab.addComment")}}</el-button>
             </div>
 
              <div v-if="textareaShow" class="textareas">
@@ -112,8 +123,8 @@
                 v-model="textarea">
                 </el-input>
                <div class="btn-box">
-                 <el-button size="mini" @click="addFun">Add</el-button>
-                <el-button size="mini" @click="cancelBtn">Cancel</el-button>
+                 <el-button size="mini" @click="addFun">{{$t("issueTab.Add")}}</el-button>
+                <el-button size="mini" @click="cancelBtn">{{$t("issueTab.Cencel")}}</el-button>
                </div>
              </div>
     </el-aside>
@@ -122,8 +133,10 @@
 </template>
 
 <script>
+import mainMixinFun from '@/components/common/mixin/mainMixinFun'
 export default {
   name: 'issueTab',
+  mixins: [mainMixinFun],
   data () {
     return {
       url: '/issue',
@@ -140,6 +153,8 @@ export default {
       contentData: [], // 评论data
       assets: [],
       contents: [],
+      createUser: [],
+      updateUser: [],
       time: '',
       defaultProps: {
         children: 'children',
@@ -195,14 +210,14 @@ export default {
           this.changeData = response.data.list
           this.time = response.time
           console.log(response.time)
-        //   console.log(this.changeData, 1)
+          console.log(response.data, 1)
         //   console.log(response.data, 2)
         }
       })
       this.$get(`${this.url}/activity?issueId=1&type=2&pageSize=-1`).then(response => { // issue动态详情接口-评论
         if (response.code === 200) {
           this.contentData = response.data.list
-        //   console.log(this.contentData, 2)
+          this.time = response.time
         }
       })
     },
@@ -236,6 +251,15 @@ export default {
       }
       return data
     },
+    // type 处理
+    typeEnums (data) {
+      if (data == 1) {
+        data = 'changed issue'
+      } else if (data == 2) {
+        data = 'created issue'
+      }
+      return data
+    },
     foldFun () {
       this.openShow = true
       this.foldShow = false

From c2ae213235766469ec38cf715612d46c21e538ff Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 5 Sep 2022 15:35:32 +0800
Subject: [PATCH 09/37] =?UTF-8?q?NEZ-2162=20feat=EF=BC=9A=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=20=E4=BF=9D=E7=95=99=E6=89=93=E5=BC=80=E5=BA=95?=
 =?UTF-8?q?=E9=83=A8=E5=BC=B9=E7=AA=97=E7=9A=84=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/build/webpack.dev.conf.js       | 14 ++--
 nezha-fronted/config/index.js                 |  3 +-
 .../chart/chart/chartTimeSeries.vue           |  2 +-
 .../common/ChartDiagram/diagram.vue           |  1 -
 .../components/common/bottomBox/bottomBox.vue |  5 ++
 .../detailView/view/detailViewRight.vue       |  9 +++
 .../src/components/common/latlngPicker.vue    |  2 -
 .../common/mixin/detailViewMixin.js           | 10 +++
 .../common/mixin/routerPathParams.js          | 67 ++++++++++++++++++-
 .../components/common/table/nzDataList.vue    |  4 ++
 nezha-fronted/src/entrance/app/App.vue        |  1 -
 nezha-fronted/src/http.js                     |  6 +-
 nezha-fronted/src/store/user.js               |  4 +-
 13 files changed, 110 insertions(+), 18 deletions(-)

diff --git a/nezha-fronted/build/webpack.dev.conf.js b/nezha-fronted/build/webpack.dev.conf.js
index ede01b850..65c565ccf 100644
--- a/nezha-fronted/build/webpack.dev.conf.js
+++ b/nezha-fronted/build/webpack.dev.conf.js
@@ -25,12 +25,14 @@ devWebpackConfig = merge(baseWebpackConfig, {
   // these devServer options should be customized in /config/index.js
   devServer: {
     clientLogLevel: 'warning',
-    historyApiFallback: {
-      index: indexHtml,
-      rewrites: [
-        { from: /.*/, to: path.posix.join(config.dev.assetsPublicPath, indexHtml) }
-      ]
-    },
+    historyApiFallback: true,
+    // historyApiFallback: {
+    //   // rewrites: [
+    //   //   // { from: /.*/, to: path.posix.join(config.dev.assetsPublicPath, indexHtml) }
+    //   //   { from: /.*/, to: '/ui' },
+    //   //   { from: '/ui', to: path.posix.join(config.dev.assetsPublicPath, indexHtml) },
+    //   // ]
+    // },
     hot: true,
     inline: true,
     contentBase: false, // since we use CopyWebpackPlugin.
diff --git a/nezha-fronted/config/index.js b/nezha-fronted/config/index.js
index 4215b1ba8..0169c2829 100644
--- a/nezha-fronted/config/index.js
+++ b/nezha-fronted/config/index.js
@@ -3,7 +3,8 @@
 // see http://vuejs-templates.github.io/webpack for documentation.
 
 const path = require('path')
-
+const devStart = process.env.npm_lifecycle_event
+const indexHtml = devStart === 'dev' ? '/src/entrance/app/index.html' : '/src/entrance/exportHtml/exportHtml.html'
 module.exports = {
   dev: {
     // Paths
diff --git a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
index 2f5e1226e..3c7ac23ce 100644
--- a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
+++ b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
@@ -146,10 +146,10 @@ export default {
       /* 使用setTimeout延迟渲染图表，避免样式错乱 */
       setTimeout(() => {
         const myChart = this.isInit ? echarts.init(document.getElementById(`chart-canvas-${this.chartId}`)) : getChart(this.chartId)
-        myChart.clear()
         if (!myChart) {
           return
         }
+        myChart.clear()
         myChart.setOption(chartOption)
         this.isInit && setChart(this.chartId, myChart) // 缓存；不使用vue的data是为避免整个chart被监听导致卡顿
 
diff --git a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
index baf465be0..786f84377 100644
--- a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
+++ b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
@@ -698,7 +698,6 @@ export default {
       if (this.fromTopologyDialog && !this.isPreview) {
         setTimeout(() => {
           this.topologyLoading = false
-          console.log(data)
           getTopology(this.topologyIndex).open(data || {})
           getTopology(this.topologyIndex).centerView()
           getTopology(this.topologyIndex).resize()
diff --git a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
index bd2731bb9..5a506fadb 100644
--- a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
+++ b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
@@ -95,9 +95,11 @@ import LogBottomTab from '@/components/common/bottomBox/tabs/logBottomTab'
 import scrapeEndpoint from '@/components/common/bottomBox/tabs/scrapeEndpoint'
 import IpDetails from '@/components/common/bottomBox/tabs/IpDetails'
 import recordRuleEvalLog from '@/components/common/bottomBox/tabs/recordRuleEvalLog'
+import routerPathParams from '@/components/common/mixin/routerPathParams'
 
 export default {
   name: 'bottomBox',
+  mixins: [routerPathParams],
   components: {
     scrapeEndpoint,
     LogBottomTab,
@@ -314,6 +316,9 @@ export default {
     },
     changeTab (tab) {
       this.$emit('update:targetTab', tab)
+      this.$nextTick(() => {
+        this.updatePath(this.$route.query, this.$route.path, 'bottomBox')
+      })
     },
     afterResize () {
       if (this.from === this.fromRoute.endpoint && this.targetTab === 'endpointQuery') {
diff --git a/nezha-fronted/src/components/common/detailView/view/detailViewRight.vue b/nezha-fronted/src/components/common/detailView/view/detailViewRight.vue
index bf4653c4e..33e43ea6a 100644
--- a/nezha-fronted/src/components/common/detailView/view/detailViewRight.vue
+++ b/nezha-fronted/src/components/common/detailView/view/detailViewRight.vue
@@ -64,9 +64,11 @@ import assetTab from '@/components/common/bottomBox/tabs/assetTab'
 import { fromRoute } from '@/components/common/js/constants'
 import LogBottomTab from '@/components/common/bottomBox/tabs/logBottomTab'
 import detailRightTop from './detailRightTop/detailRightTop'
+import routerPathParams from "@/components/common/mixin/routerPathParams";
 
 export default {
   name: 'detailViewRight',
+  mixins: [routerPathParams],
   components: {
     LogBottomTab,
     cabinetTab,
@@ -276,6 +278,9 @@ export default {
     },
     changeTab (tab) {
       this.targetTab = tab
+      this.$nextTick(() => {
+        this.updatePath(this.$route.query, this.$route.path, 'bottomBox')
+      })
     },
     afterResize () {
       if (this.from === this.fromRoute.endpoint && this.targetTab === 'endpointQuery') {
@@ -290,6 +295,10 @@ export default {
       this.$emit('getTableData')
     },
     setTargetTab () {
+      if (this.$route.query.targetTab) {
+        this.targetTab = this.$route.query.targetTab
+        return
+      }
       if (this.from === fromRoute.asset) {
         this.targetTab = 'panelTab'
       } else if (this.from === fromRoute.endpoint) {
diff --git a/nezha-fronted/src/components/common/latlngPicker.vue b/nezha-fronted/src/components/common/latlngPicker.vue
index c9215586b..3b228085d 100644
--- a/nezha-fronted/src/components/common/latlngPicker.vue
+++ b/nezha-fronted/src/components/common/latlngPicker.vue
@@ -76,7 +76,6 @@ export default {
         maxBounds: [[-179, -85], [179, 85]],
         hash: false,
         transformRequest: function (url, resourceType) {
-          console.log(resourceType)
           if (resourceType === 'Tile' && url.indexOf('https://api.maptiler.com/tiles/v3') > -1) {
             const urlParams = url.split('.pbf')[0].split('/')
             const z = urlParams[urlParams.length - 3]
@@ -161,7 +160,6 @@ export default {
       })
       // const marker = L.marker([this.mapParam.latitude, this.mapParam.longitude]).addTo(map)
       this.map.on('click', function (e) {
-        console.log(e, e.lngLat)
         const coords = e.lngLat
         geoJSON.features[0].geometry.coordinates = [coords.lng, coords.lat]
         self.map.getSource('centerMarker').setData(geoJSON)
diff --git a/nezha-fronted/src/components/common/mixin/detailViewMixin.js b/nezha-fronted/src/components/common/mixin/detailViewMixin.js
index b8d20fa22..475c021eb 100644
--- a/nezha-fronted/src/components/common/mixin/detailViewMixin.js
+++ b/nezha-fronted/src/components/common/mixin/detailViewMixin.js
@@ -1,5 +1,14 @@
 export default {
   props: {},
+  watch: {
+    detailViewRightObj: {
+      handler (n) {
+        if (n) {
+          this.updatePath(this.$route.query, this.$route.path, 'nzDetailList')
+        }
+      }
+    }
+  },
   data () {
     return {
       detailType: localStorage.getItem('detail-view-' + this.tableId) || 'list',
@@ -21,6 +30,7 @@ export default {
       //   this.detailViewRightObj = ''
       // }
       this.detailType = flag
+      this.$router.replace({ query: { ...this.$route.query, detailType: flag } }).catch(err => {})
       let dataList = ''
       localStorage.setItem('detail-view-' + this.tableId, this.detailType)
       if (this.detailType === 'view') {
diff --git a/nezha-fronted/src/components/common/mixin/routerPathParams.js b/nezha-fronted/src/components/common/mixin/routerPathParams.js
index 2ef0e5f72..fb3e23efc 100644
--- a/nezha-fronted/src/components/common/mixin/routerPathParams.js
+++ b/nezha-fronted/src/components/common/mixin/routerPathParams.js
@@ -27,16 +27,79 @@ export default {
         }, 200)
         qv && this.$set(val.target, val.propertyName, qv)
       })
+      if (q.bottomBox && JSON.parse(q.bottomBox)) {
+        this.$nextTick(() => {
+          this.detailType = q.detailType
+          const detailType = this.detailType === 'list' ? 'dataList' : 'detailList'
+          this.$refs[detailType].bottomBox.showSubList = JSON.parse(q.bottomBox)
+          this.$refs[detailType].bottomBox.targetTab = q.targetTab
+          this.$refs[detailType].bottomBox.object = JSON.parse(q.selectObj)
+        })
+      } else if (this.detailType === 'view') {
+        this.detailType = q.detailType
+        this.detailViewRightObj = JSON.parse(q.selectObj)
+        this.$store.commit('setGlobalSearchId', this.detailViewRightObj.id)
+      }
     },
     // 更新path，包含请求参数
-    updatePath (param, path) {
+    updatePath (param, path, from) {
       const params = lodash.cloneDeep(param)
       Object.keys(params).forEach(key => {
         if (!params[key]) {
           delete params[key]
         }
       })
-      this.$router.replace({ path: path, query: params }).catch(err => {})
+      if (!from) {
+        const detailType = this.detailType === 'list' ? 'dataList' : 'detailList'
+        localStorage.setItem('detail-view-' + this.tableId, this.detailType)
+        params.detailType = this.detailType
+        params.bottomBox = this.$refs[detailType].bottomBox.showSubList
+        if (this.detailType === 'list') {
+          params.targetTab = this.$refs[detailType].bottomBox.targetTab
+        } else {
+          params.targetTab = this.$route.query.targetTab
+        }
+        if (this.detailType === 'list') {
+          params.selectObj = JSON.stringify({
+            id: this.$refs[detailType].bottomBox.object.id,
+            name: this.$refs[detailType].bottomBox.object.name,
+            config: this.$refs[detailType].bottomBox.object.config || '',
+            childrenNum: this.$refs[detailType].bottomBox.object.childrenNum || ''
+          })
+        } else {
+          this.$nextTick(() => {
+            params.selectObj = JSON.stringify({
+              id: this.$refs[detailType].detailViewRightObj.id,
+              name: this.$refs[detailType].detailViewRightObj.name,
+              config: this.$refs[detailType].detailViewRightObj.config || '',
+              childrenNum: this.$refs[detailType].detailViewRightObj.childrenNum || ''
+            })
+          })
+        }
+        this.$router.replace({ path: path, query: params }).catch(err => {})
+      } else if (from === 'nzDatalist') {
+        params.bottomBox = this.bottomBox.showSubList
+        params.targetTab = this.bottomBox.targetTab
+        params.selectObj = JSON.stringify({
+          id: this.bottomBox.object.id,
+          name: this.bottomBox.object.name,
+          config: this.bottomBox.object.config || '',
+          childrenNum: this.bottomBox.object.childrenNum || ''
+        })
+        this.$router.replace({ path: path, query: params }).catch(err => {})
+      } else if (from === 'nzDetailList') {
+        params.targetTab = this.$route.query.targetTab
+        params.selectObj = JSON.stringify({
+          id: this.detailViewRightObj.id,
+          name: this.detailViewRightObj.name,
+          config: this.detailViewRightObj.config || '',
+          childrenNum: this.detailViewRightObj.childrenNum || ''
+        })
+        this.$router.replace({ path: path, query: params }).catch(err => {})
+      } else if (from === 'bottomBox') {
+        params.targetTab = this.targetTab
+        this.$router.replace({ path: path, query: params }).catch(err => {})
+      }
     },
     setSearchInput (val, qv) {
       let dataList = ''
diff --git a/nezha-fronted/src/components/common/table/nzDataList.vue b/nezha-fronted/src/components/common/table/nzDataList.vue
index fe86098c3..f911783b4 100644
--- a/nezha-fronted/src/components/common/table/nzDataList.vue
+++ b/nezha-fronted/src/components/common/table/nzDataList.vue
@@ -106,8 +106,11 @@ import bottomBox from '@/components/common/bottomBox/bottomBox'
 import { bottomBoxWindow } from '@/components/common/js/tools'
 import panelChart from '@/components/chart/panelChart'
 import bus from '@/libs/bus'
+import routerPathParams from "@/components/common/mixin/routerPathParams";
+import lodash from "lodash";
 export default {
   name: 'nzDataList',
+  mixins: [routerPathParams],
   components: {
     bottomBox,
     panelChart
@@ -217,6 +220,7 @@ export default {
       this.bottomBox.targetTab = targetTab
       this.bottomBox.object = JSON.parse(JSON.stringify(row))
       this.bottomBox.showSubList = true
+      this.updatePath(this.$route.query, this.$route.path, 'nzDatalist')
     },
     search (searchObj) {
       this.$emit('search', searchObj)
diff --git a/nezha-fronted/src/entrance/app/App.vue b/nezha-fronted/src/entrance/app/App.vue
index b9c58c69c..4f8132b39 100644
--- a/nezha-fronted/src/entrance/app/App.vue
+++ b/nezha-fronted/src/entrance/app/App.vue
@@ -22,7 +22,6 @@ export default {
     // }
     const Timestamp = new Date().getTime()
     const url = '/static/config.json?Timestamp=' + Timestamp
-    console.log(url)
     const result = await this.$http.get(url) // 获取本地的config.json 判断是否需要清空localStorage 以及设备的宽 和 axios的baseUrl
     this.$axios.defaults.baseURL = result.body.baseUrl
     const version = result.body.version
diff --git a/nezha-fronted/src/http.js b/nezha-fronted/src/http.js
index 384e901de..b5833647e 100644
--- a/nezha-fronted/src/http.js
+++ b/nezha-fronted/src/http.js
@@ -40,7 +40,7 @@ axios.interceptors.request.use(
 )
 const accountErrorCode = [518003, 518004, 518005, 518006, 518007, 518008] // 账号锁定等
 const licenceErrorCode = [711001]
-const noJumpPath = ['#/', '#/login']
+const noJumpPath = ['/', '/login', '/ui/login']
 
 // 若get请求的url中带问号，则将url上的参数截取，改为对象形式传参
 axios.interceptors.request.use(
@@ -81,10 +81,10 @@ axios.interceptors.response.use(
       removePending(response.config)
       return response
     }
-    if (licenceErrorCode.indexOf(response.data.code) !== -1 && noJumpPath.indexOf(window.location.hash) == -1) {
+    if (licenceErrorCode.indexOf(response.data.code) !== -1 && noJumpPath.indexOf(window.location.pathname) == -1) {
       window.location.href = '/'
     } else if (response.status === 200) {
-      if (accountErrorCode.indexOf(response.data.code) !== -1 && noJumpPath.indexOf(window.location.hash) == -1) {
+      if (accountErrorCode.indexOf(response.data.code) !== -1 && noJumpPath.indexOf(window.location.pathname) == -1) {
         sessionStorage.setItem('nz-previous-page', router.currentRoute.fullPath)
         window.location.href = '/'
       }
diff --git a/nezha-fronted/src/store/user.js b/nezha-fronted/src/store/user.js
index fe4ecfd02..2b81217c0 100644
--- a/nezha-fronted/src/store/user.js
+++ b/nezha-fronted/src/store/user.js
@@ -5,6 +5,7 @@ import { returnMenuCode, sortByOrderNum } from '@/permission'
 import moment from 'moment-timezone'
 import { theme } from '@/components/common/js/constants'
 
+const noJumpPath = ['/', '/login', '/ui/login']
 const user = {
   state: {
     menuList: [],
@@ -143,7 +144,7 @@ const user = {
           })
         }
         // 登录成功后跳回到原来页面
-        if (sessionStorage.getItem('nz-previous-page')) {
+        if (sessionStorage.getItem('nz-previous-page') && noJumpPath.indexOf(sessionStorage.getItem('nz-previous-page')) === -1) {
           const route = sessionStorage.getItem('nz-previous-page')
           router.push({
             path: route
@@ -151,6 +152,7 @@ const user = {
             sessionStorage.removeItem('nz-previous-page')
           })
         } else {
+          sessionStorage.removeItem('nz-previous-page')
           router.push({
             path: path[0],
             query: {

From 7bafbc49eb2fc5b80b609c410989a530b35fe783 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Mon, 5 Sep 2022 16:23:13 +0800
Subject: [PATCH 10/37] =?UTF-8?q?fix=20:=20recordRule=20=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/table/settings/recordRuleTable.vue    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nezha-fronted/src/components/common/table/settings/recordRuleTable.vue b/nezha-fronted/src/components/common/table/settings/recordRuleTable.vue
index 1260c71ff..995dc5073 100644
--- a/nezha-fronted/src/components/common/table/settings/recordRuleTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/recordRuleTable.vue
@@ -1,5 +1,4 @@
 <template>
-<div>
   <el-table
     id="recordRuleTable"
     ref="dataTable"
@@ -132,7 +131,6 @@
       <div v-else>&nbsp;</div>
     </template>
   </el-table>
-  </div>
 </template>
 
 <script>

From 96e8abcd49b6705eca85e8dd73f1b18d71dae36e Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 5 Sep 2022 16:57:38 +0800
Subject: [PATCH 11/37] =?UTF-8?q?style=EF=BC=9A=20=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=81=A2=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/login.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/common/login.vue b/nezha-fronted/src/components/common/login.vue
index 64556e77a..0fedd6e19 100644
--- a/nezha-fronted/src/components/common/login.vue
+++ b/nezha-fronted/src/components/common/login.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="login"  id="login-bgimg">
     <div class="model"></div>
-    <div class="stars-wrapper" id="stars-wrapper" v-if="!this.bgImg">
+    <div class="stars-wrapper" id="stars-wrapper" v-if="false">
       <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 358.52 351.84" class="star-cloud star-cloud1">
         <g id="Layer_2" data-name="Layer 2">
           <g id="Layer_1-2" data-name="Layer 1">
@@ -583,7 +583,7 @@ export default {
     if (this.bgImg) {
       document.getElementById('login-bgimg').style['background-image'] = `url(${this.bgImg})`
     } else {
-      this.initStar()
+      // this.initStar()
     }
   },
   beforeDestroy () {

From f85edd121d2dc256ea5a18552ab62e1a12c71f0e Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 5 Sep 2022 17:45:49 +0800
Subject: [PATCH 12/37] =?UTF-8?q?fix=EF=BC=9Atopology=20=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/package.json                    |  2 +-
 .../src/components/chart/chart/chartMap.vue   |  6 +++---
 .../src/components/chart/chart/mapStyle.js    |  8 +++----
 .../common/ChartDiagram/diagram.vue           |  3 ++-
 .../common/project/L5/CanvasProps.vue         |  3 ++-
 .../components/common/project/topologyL5.vue  | 21 ++++++++++++++++++-
 .../common/project/topologyMixin.js           |  2 +-
 7 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/nezha-fronted/package.json b/nezha-fronted/package.json
index 8dfd2e29b..a4f4fd874 100644
--- a/nezha-fronted/package.json
+++ b/nezha-fronted/package.json
@@ -28,7 +28,7 @@
     "@topology/activity-diagram": "^1.1.0",
     "@topology/chart-diagram": "^1.1.0",
     "@topology/class-diagram": "^1.1.0",
-    "@topology/core": "^1.1.32",
+    "@topology/core": "^1.1.34",
     "@topology/flow-diagram": "^1.1.1",
     "@topology/form-diagram": "^1.1.32",
     "@topology/sequence-diagram": "^1.1.0",
diff --git a/nezha-fronted/src/components/chart/chart/chartMap.vue b/nezha-fronted/src/components/chart/chart/chartMap.vue
index 50524c092..bf62c4bd5 100644
--- a/nezha-fronted/src/components/chart/chart/chartMap.vue
+++ b/nezha-fronted/src/components/chart/chart/chartMap.vue
@@ -135,7 +135,7 @@ export default {
                   const z = urlParams[urlParams.length - 3]
                   const x = urlParams[urlParams.length - 2]
                   const y = urlParams[urlParams.length - 1]
-                  const newUrl1 = `nzMap://static/Titles/${z}/${x}/${y}.pbf`
+                  const newUrl1 = `nzMap:///static/Titles/${z}/${x}/${y}.pbf`
                   return {
                     url: newUrl1,
                     credentials: 'include',
@@ -145,7 +145,7 @@ export default {
                 }
                 if (resourceType === 'SpriteJSON') {
                   return {
-                    url: 'nzMap://static/Titles/sprite.json',
+                    url: 'nzMap:///static/Titles/sprite.json',
                     credentials: 'include',
                     method: 'GET'
                     // Include cookies for cross-origin requests
@@ -153,7 +153,7 @@ export default {
                 }
                 if (resourceType === 'SpriteImage') {
                   return {
-                    url: 'nzMap://static/Titles/sprite.png',
+                    url: 'nzMap:///static/Titles/sprite.png',
                     credentials: 'include',
                     method: 'GET'
                     // Include cookies for cross-origin requests
diff --git a/nezha-fronted/src/components/chart/chart/mapStyle.js b/nezha-fronted/src/components/chart/chart/mapStyle.js
index 3ca65dbb5..394cc9b71 100644
--- a/nezha-fronted/src/components/chart/chart/mapStyle.js
+++ b/nezha-fronted/src/components/chart/chart/mapStyle.js
@@ -5,7 +5,7 @@ const mapAllStyle = {
     name: 'Maptiler.com: Basic',
     sources: {
       openmaptiles: {
-        url: 'static/Titles/tiles.json',
+        url: '/static/Titles/tiles.json',
         type: 'vector'
       },
       maptiler_attribution: {
@@ -15,7 +15,7 @@ const mapAllStyle = {
     },
     layers: [{ id: 'background', type: 'background', paint: { 'background-color': 'rgb(242, 242, 242)' } }, { id: 'landuse_residential', type: 'fill', source: 'openmaptiles', 'source-layer': 'landuse', layout: { visibility: 'visible' }, paint: { 'fill-color': { stops: [[6, 'rgb(222, 222, 222)'], [14, 'rgb(253, 253, 253)'], [18, 'rgb(255, 255, 255)']] }, 'fill-opacity': 0.7 }, filter: ['all', ['in', 'class', 'residential', 'suburb', 'neighbourhood']] }, { id: 'landcover_grass', type: 'fill', source: 'openmaptiles', 'source-layer': 'landcover', paint: { 'fill-color': 'rgb(244, 244, 244)', 'fill-opacity': 0.4 }, filter: ['==', 'class', 'grass'] }, { id: 'landcover_wood', type: 'fill', source: 'openmaptiles', 'source-layer': 'landcover', paint: { 'fill-color': 'rgb(237, 237, 237)', 'fill-opacity': 0.8 }, filter: ['==', 'class', 'wood'] }, { id: 'landcover_sand', type: 'fill', source: 'openmaptiles', 'source-layer': 'landcover', paint: { 'fill-color': 'rgb(188, 188, 188)', 'fill-opacity': 0.3, 'fill-antialias': false }, metadata: {}, filter: ['all', ['in', 'class', 'sand']] }, { id: 'landcover_glacier', type: 'fill', source: 'openmaptiles', 'source-layer': 'landcover', layout: { visibility: 'visible' }, paint: { 'fill-color': 'rgb(243, 243, 243)', 'fill-opacity': 1 }, filter: ['all', ['in', 'subclass', 'glacier', 'ice_shelf']] }, { id: 'water', type: 'fill', source: 'openmaptiles', 'source-layer': 'water', layout: { visibility: 'visible' }, paint: { 'fill-color': 'rgb(217, 218, 221)' }, filter: ['all', ['!=', 'intermittent', 1], ['!=', 'brunnel', 'tunnel']] }, { id: 'water_intermittent', type: 'fill', source: 'openmaptiles', 'source-layer': 'water', layout: { visibility: 'visible' }, paint: { 'fill-color': 'rgb(217, 218, 221)', 'fill-opacity': 0.7 }, filter: ['all', ['==', 'intermittent', 1]] }, { id: 'waterway_tunnel', type: 'line', source: 'openmaptiles', 'source-layer': 'waterway', layout: { visibility: 'visible' }, paint: { 'line-color': 'rgb(217, 218, 221)', 'line-width': 1, 'line-opacity': 0.7, 'line-dasharray': [3, 3] }, filter: ['all', ['==', 'brunnel', 'tunnel']] }, { id: 'waterway', type: 'line', source: 'openmaptiles', 'source-layer': 'waterway', layout: { visibility: 'visible' }, paint: { 'line-color': 'rgb(217, 218, 221)', 'line-width': { stops: [[8, 1], [15, 3]] }, 'line-opacity': 1 }, filter: ['all', ['!in', 'brunnel', 'tunnel', 'bridge'], ['!=', 'intermittent', 1]] }, { id: 'waterway_intermittent', type: 'line', source: 'openmaptiles', 'source-layer': 'waterway', layout: { visibility: 'visible' }, paint: { 'line-color': 'rgb(217, 218, 221)', 'line-width': { stops: [[8, 1], [15, 3]] }, 'line-opacity': 1, 'line-dasharray': [2, 1] }, filter: ['all', ['!in', 'brunnel', 'tunnel', 'bridge'], ['==', 'intermittent', 1]] }, { id: 'building', type: 'fill', source: 'openmaptiles', 'source-layer': 'building', layout: { visibility: 'none' }, paint: { 'fill-color': 'rgba(212, 204, 176, 1)', 'fill-opacity': 0.6, 'fill-antialias': true } }, { id: 'road_area_pier', type: 'fill', source: 'openmaptiles', 'source-layer': 'transportation', layout: { visibility: 'visible' }, paint: { 'fill-color': 'rgb(250, 250, 250)', 'fill-opacity': 1, 'fill-antialias': true }, metadata: {}, filter: ['all', ['==', '$type', 'Polygon'], ['==', 'class', 'pier']] }, { id: 'road_area_bridge', type: 'fill', source: 'openmaptiles', 'source-layer': 'transportation', layout: {}, paint: { 'fill-color': 'hsl(47, 26%, 88%)', 'fill-opacity': 0.7 }, filter: ['all', ['==', '$type', 'Polygon'], ['in', 'brunnel', 'bridge']] }, { id: 'road_pier', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', layout: { 'line-cap': 'round', 'line-join': 'round' }, paint: { 'line-color': 'hsl(47, 26%, 88%)', 'line-width': 1 }, metadata: {}, filter: ['all', ['in', 'class', 'pier']] }, { id: 'road_path', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', minzoom: 14, layout: { 'line-cap': 'square', 'line-join': 'bevel' }, paint: { 'line-color': 'hsl(0, 0%, 97%)', 'line-width': { base: 1.55, stops: [[14, 0.5], [20, 4]] }, 'line-dasharray': [1, 1] }, filter: ['all', ['in', 'class', 'path', 'track']] }, { id: 'road_minor', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', minzoom: 13, layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'visible' }, paint: { 'line-color': 'hsl(0, 0%, 97%)', 'line-width': { base: 1.55, stops: [[4, 0.25], [20, 24]] } }, filter: ['all', ['in', 'class', 'minor', 'service']] }, { id: 'road_tunnel', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', layout: { 'line-cap': 'butt', 'line-join': 'miter', visibility: 'visible' }, paint: { 'line-color': '#fff', 'line-width': { base: 1.4, stops: [[7, 0.5], [20, 24]] }, 'line-opacity': 0.75, 'line-dasharray': [0.28, 0.14] }, filter: ['all', ['==', 'brunnel', 'tunnel'], ['in', 'class', 'primary', 'secondary', 'tertiary', 'trunk', 'minor_road']] }, { id: 'road_major', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', minzoom: 7, layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'visible' }, paint: { 'line-color': '#fff', 'line-width': { base: 1.4, stops: [[7, 0.5], [20, 28]] } }, filter: ['all', ['in', 'class', 'trunk', 'primary', 'secondary', 'tertiary'], ['!=', 'brunnel', 'tunnel'], ['!=', 'brunnel', 'bridge']] }, { id: 'road_motorway', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', minzoom: 4, layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'visible' }, paint: { 'line-color': 'hsl(0, 0%, 100%)', 'line-width': { base: 1.4, stops: [[8, 1], [16, 10]] }, 'line-offset': 0 }, filter: ['all', ['==', 'class', 'motorway']] }, { id: 'railway_transit_tunnel', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', minzoom: 0, layout: { 'line-cap': 'butt', 'line-join': 'miter', visibility: 'visible' }, paint: { 'line-color': 'hsl(34, 12%, 66%)', 'line-opacity': 0.5, 'line-dasharray': [3, 3] }, filter: ['all', ['==', 'brunnel', 'tunnel'], ['==', 'class', 'transit']] }, { id: 'railway', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', minzoom: 11, layout: { visibility: 'visible' }, paint: { 'line-color': 'hsl(34, 12%, 66%)', 'line-opacity': 0.5 }, filter: ['==', 'class', 'rail'] }, { id: 'railway_transit', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', layout: { visibility: 'visible' }, paint: { 'line-color': 'hsl(34, 12%, 66%)', 'line-opacity': 0.5 }, filter: ['all', ['==', 'class', 'transit'], ['!=', 'brunnel', 'tunnel']] }, { id: 'aeroway_taxiway', type: 'line', source: 'openmaptiles', 'source-layer': 'aeroway', minzoom: 12, layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'visible' }, paint: { 'line-color': 'rgba(255, 255, 255, 1)', 'line-width': 1, 'line-opacity': 1 }, metadata: { 'mapbox:group': '1444849345966.4436' }, filter: ['all', ['in', 'class', 'taxiway']] }, { id: 'aeroway_runway', type: 'line', source: 'openmaptiles', 'source-layer': 'aeroway', minzoom: 4, layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'visible' }, paint: { 'line-color': 'rgba(255, 255, 255, 1)', 'line-width': 5, 'line-opacity': 1 }, metadata: { 'mapbox:group': '1444849345966.4436' }, filter: ['all', ['in', 'class', 'runway']] }, { id: 'bridge_waterway', type: 'line', source: 'openmaptiles', 'source-layer': 'waterway', layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'none' }, paint: { 'line-color': 'hsl(205, 56%, 73%)', 'line-width': 1 }, filter: ['all', ['==', 'brunnel', 'bridge']] }, { id: 'bridge', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'visible' }, paint: { 'line-color': '#fff', 'line-width': { base: 1.4, stops: [[7, 0.5], [20, 28]] } }, filter: ['all', ['==', 'brunnel', 'bridge'], ['in', 'class', 'primary', 'secondary', 'tertiary', 'trunk']] }, { id: 'admin_sub', type: 'line', source: 'openmaptiles', 'source-layer': 'boundary', minzoom: 3, layout: { visibility: 'visible' }, paint: { 'line-color': 'rgba(184, 192, 201, 0.5)', 'line-width': 1.25, 'line-dasharray': [2, 1] }, filter: ['in', 'admin_level', 4, 6, 8] }, { id: 'admin_disputed', type: 'line', source: 'openmaptiles', 'source-layer': 'boundary', minzoom: 5, layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'visible' }, paint: { 'line-color': 'rgb(194, 201, 209)', 'line-width': 1, 'line-dasharray': [2, 2] }, filter: ['all', ['<=', 'admin_level', 2], ['==', '$type', 'LineString'], ['==', 'disputed', 1]] }, { id: 'admin_country', type: 'line', source: 'openmaptiles', 'source-layer': 'boundary', minzoom: 0, layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'visible' }, paint: { 'line-color': 'rgb(194, 201, 209)', 'line-width': 1 }, filter: ['all', ['<=', 'admin_level', 2], ['==', '$type', 'LineString'], ['!has', 'claimed_by']] }, { id: 'label_airport', type: 'symbol', source: 'openmaptiles', 'source-layer': 'aerodrome_label', minzoom: 10, layout: { 'icon-size': 1, 'text-font': ['Noto Sans Regular'], 'text-size': 11, 'text-field': '{name:latin}\n{name:nonlatin}', visibility: 'visible', 'text-anchor': 'top', 'text-offset': [0, 0.5], 'text-max-width': 8 }, paint: { 'text-color': 'rgb(215, 217, 220)', 'text-halo-blur': 1, 'text-halo-color': 'rgba(255, 255, 255, 0.75)', 'text-halo-width': 1 }, filter: ['all', ['has', 'iata']] }, { id: 'label_road', type: 'symbol', source: 'openmaptiles', 'source-layer': 'transportation_name', minzoom: 13, layout: { 'text-font': ['Noto Sans Regular'], 'text-size': { base: 1.4, stops: [[10, 8], [20, 14]] }, 'text-field': '{name:latin} {name:nonlatin}', visibility: 'visible', 'text-transform': 'uppercase', 'symbol-placement': 'line', 'text-letter-spacing': 0.1, 'text-rotation-alignment': 'map' }, paint: { 'text-color': 'rgb(107, 115, 124)', 'text-halo-color': 'rgb(255, 255, 255)', 'text-halo-width': 2 }, filter: ['all', ['==', '$type', 'LineString'], ['!=', 'subclass', 'ferry']] }, { id: 'label_place_other', type: 'symbol', source: 'openmaptiles', 'source-layer': 'place', minzoom: 8, layout: { 'text-font': ['Noto Sans Regular'], 'text-size': { stops: [[6, 10], [12, 14]] }, 'text-field': '{name:latin}\n{name:nonlatin}', visibility: 'visible', 'text-anchor': 'center', 'text-max-width': 6 }, paint: { 'text-color': 'rgb(174, 179, 185)', 'text-halo-blur': 0, 'text-halo-color': 'rgb(255, 255, 255)', 'text-halo-width': 2 }, filter: ['all', ['==', '$type', 'Point'], ['!in', 'class', 'city', 'state', 'country', 'continent']] }, { id: 'label_place_city', type: 'symbol', source: 'openmaptiles', 'source-layer': 'place', maxzoom: 16, layout: { 'text-font': ['Noto Sans Regular'], 'text-size': { stops: [[3, 11], [8, 16]] }, 'text-field': '{name:latin}\n{name:nonlatin}', 'text-max-width': 10 }, paint: { 'text-color': 'rgb(107, 115, 124)', 'text-halo-blur': 0, 'text-halo-color': 'rgba(255, 255, 255, 0.75)', 'text-halo-width': 2 }, filter: ['all', ['==', '$type', 'Point'], ['==', 'class', 'city']] }, { id: 'label_country_other', type: 'symbol', source: 'openmaptiles', 'source-layer': 'place', maxzoom: 12, layout: { 'text-font': ['Noto Sans Regular'], 'text-size': { stops: [[3, 12], [8, 22]] }, 'text-field': '{name:latin}', visibility: 'visible', 'text-max-width': 10 }, paint: { 'text-color': 'rgb(141, 148, 156)', 'text-halo-blur': 0, 'text-halo-color': 'rgba(255, 255, 255, 0.75)', 'text-halo-width': 2 }, filter: ['all', ['==', '$type', 'Point'], ['==', 'class', 'country'], ['!has', 'iso_a2']] }, { id: 'label_country', type: 'symbol', source: 'openmaptiles', 'source-layer': 'place', maxzoom: 12, layout: { 'text-font': ['Noto Sans Bold'], 'text-size': { stops: [[3, 12], [8, 22]] }, 'text-field': '{name:latin}', visibility: 'visible', 'text-max-width': 10 }, paint: { 'text-color': 'rgb(141, 148, 156)', 'text-halo-blur': 0, 'text-halo-color': 'rgba(255, 255, 255, 0.75)', 'text-halo-width': 2 }, filter: ['all', ['==', '$type', 'Point'], ['==', 'class', 'country'], ['has', 'iso_a2']] }],
     metadata: { 'maptiler:copyright': 'This style was generated on MapTiler Cloud. Usage outside of MapTiler Cloud or MapTiler Server requires valid MapTiler Data package: https://www.maptiler.com/data/ -- please contact us.' },
-    glyphs: 'static/Titles/fonts/{fontstack}/{range}.pbf?key=rB2y2a2rG8i9SEjOXQXl',
+    glyphs: '/static/Titles/fonts/{fontstack}/{range}.pbf?key=rB2y2a2rG8i9SEjOXQXl',
     sprite: 'https://www.maptiler.com/static/Titles/sprite',
     bearing: 0,
     pitch: 0,
@@ -28,7 +28,7 @@ const mapAllStyle = {
     name: 'Maptiler.com: Basic',
     sources: {
       openmaptiles: {
-        url: 'static/Titles/tiles.json',
+        url: '/static/Titles/tiles.json',
         type: 'vector'
       },
       maptiler_attribution: {
@@ -38,7 +38,7 @@ const mapAllStyle = {
     },
     layers: [{ id: 'background', type: 'background', paint: { 'background-color': 'rgb(33, 33, 33)' } }, { id: 'landuse_residential', type: 'fill', source: 'openmaptiles', 'source-layer': 'landuse', layout: { visibility: 'visible' }, paint: { 'fill-color': { stops: [[6, 'rgb(13, 13, 13)'], [14, 'rgb(44, 44, 44)'], [18, 'rgb(56, 56, 56)']] }, 'fill-opacity': 0.7 }, filter: ['all', ['in', 'class', 'residential', 'suburb', 'neighbourhood']] }, { id: 'landcover_grass', type: 'fill', source: 'openmaptiles', 'source-layer': 'landcover', paint: { 'fill-color': 'rgb(23, 23, 23)', 'fill-opacity': 0.4 }, filter: ['==', 'class', 'grass'] }, { id: 'landcover_wood', type: 'fill', source: 'openmaptiles', 'source-layer': 'landcover', paint: { 'fill-color': 'rgb(16, 16, 16)', 'fill-opacity': 0.8 }, filter: ['==', 'class', 'wood'] }, { id: 'landcover_sand', type: 'fill', source: 'openmaptiles', 'source-layer': 'landcover', paint: { 'fill-color': 'rgb(0, 0, 0)', 'fill-opacity': 0.3, 'fill-antialias': false }, metadata: {}, filter: ['all', ['in', 'class', 'sand']] }, { id: 'landcover_glacier', type: 'fill', source: 'openmaptiles', 'source-layer': 'landcover', layout: { visibility: 'none' }, paint: { 'fill-color': 'rgba(236, 235, 230, 1)', 'fill-opacity': 1 }, filter: ['all', ['in', 'subclass', 'glacier', 'ice_shelf']] }, { id: 'water', type: 'fill', source: 'openmaptiles', 'source-layer': 'water', layout: { visibility: 'visible' }, paint: { 'fill-color': 'rgb(0, 0, 0)' }, filter: ['all', ['!=', 'intermittent', 1], ['!=', 'brunnel', 'tunnel']] }, { id: 'water_intermittent', type: 'fill', source: 'openmaptiles', 'source-layer': 'water', layout: { visibility: 'visible' }, paint: { 'fill-color': 'rgb(0, 0, 0)', 'fill-opacity': 0.7 }, filter: ['all', ['==', 'intermittent', 1]] }, { id: 'waterway_tunnel', type: 'line', source: 'openmaptiles', 'source-layer': 'waterway', layout: { visibility: 'visible' }, paint: { 'line-color': 'rgb(0, 0, 0)', 'line-width': 1, 'line-opacity': 0.7, 'line-dasharray': [3, 3] }, filter: ['all', ['==', 'brunnel', 'tunnel']] }, { id: 'waterway', type: 'line', source: 'openmaptiles', 'source-layer': 'waterway', layout: { visibility: 'visible' }, paint: { 'line-color': 'rgb(0, 0, 0)', 'line-width': { stops: [[8, 1], [15, 3]] }, 'line-opacity': 1 }, filter: ['all', ['!in', 'brunnel', 'tunnel', 'bridge'], ['!=', 'intermittent', 1]] }, { id: 'waterway_intermittent', type: 'line', source: 'openmaptiles', 'source-layer': 'waterway', layout: { visibility: 'visible' }, paint: { 'line-color': 'rgb(0, 0, 0)', 'line-width': { stops: [[8, 1], [15, 3]] }, 'line-opacity': 1, 'line-dasharray': [2, 1] }, filter: ['all', ['!in', 'brunnel', 'tunnel', 'bridge'], ['==', 'intermittent', 1]] }, { id: 'building', type: 'fill', source: 'openmaptiles', 'source-layer': 'building', paint: { 'fill-color': 'rgb(51, 51, 51)', 'fill-opacity': 0.6, 'fill-antialias': true } }, { id: 'road_area_pier', type: 'fill', source: 'openmaptiles', 'source-layer': 'transportation', layout: { visibility: 'visible' }, paint: { 'fill-color': 'rgb(41, 41, 41)', 'fill-opacity': 1, 'fill-antialias': true }, metadata: {}, filter: ['all', ['==', '$type', 'Polygon'], ['==', 'class', 'pier']] }, { id: 'road_area_bridge', type: 'fill', source: 'openmaptiles', 'source-layer': 'transportation', layout: {}, paint: { 'fill-color': 'rgb(24, 21, 14)', 'fill-opacity': 0.7 }, filter: ['all', ['==', '$type', 'Polygon'], ['in', 'brunnel', 'bridge']] }, { id: 'road_pier', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', layout: { 'line-cap': 'round', 'line-join': 'round' }, paint: { 'line-color': 'rgb(24, 21, 14)', 'line-width': 1 }, metadata: {}, filter: ['all', ['in', 'class', 'pier']] }, { id: 'road_path', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', minzoom: 14, layout: { 'line-cap': 'square', 'line-join': 'bevel' }, paint: { 'line-color': 'rgb(42, 42, 42)', 'line-width': { base: 1.55, stops: [[14, 0.5], [20, 4]] }, 'line-dasharray': [1, 1] }, filter: ['all', ['in', 'class', 'path', 'track']] }, { id: 'road_minor', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', minzoom: 13, layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'visible' }, paint: { 'line-color': 'rgb(42, 42, 42)', 'line-width': { base: 1.55, stops: [[4, 0.25], [20, 24]] } }, filter: ['all', ['in', 'class', 'minor', 'service']] }, { id: 'road_tunnel', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', layout: { 'line-cap': 'butt', 'line-join': 'miter', visibility: 'visible' }, paint: { 'line-color': 'rgb(50, 50, 50)', 'line-width': { base: 1.4, stops: [[7, 0.5], [20, 24]] }, 'line-opacity': 0.75, 'line-dasharray': [0.28, 0.14] }, filter: ['all', ['==', 'brunnel', 'tunnel'], ['in', 'class', 'primary', 'secondary', 'tertiary', 'trunk', 'minor_road']] }, { id: 'road_major', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', minzoom: 7, layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'visible' }, paint: { 'line-color': 'rgb(50, 50, 50)', 'line-width': { base: 1.4, stops: [[7, 0.5], [20, 28]] } }, filter: ['all', ['in', 'class', 'trunk', 'primary', 'secondary', 'tertiary'], ['!=', 'brunnel', 'tunnel'], ['!=', 'brunnel', 'bridge']] }, { id: 'road_motorway', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', minzoom: 4, layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'visible' }, paint: { 'line-color': 'rgb(50, 50, 50)', 'line-width': { base: 1.4, stops: [[8, 1], [16, 10]] }, 'line-offset': 0 }, filter: ['all', ['==', 'class', 'motorway']] }, { id: 'railway_transit_tunnel', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', minzoom: 0, layout: { 'line-cap': 'butt', 'line-join': 'miter', visibility: 'visible' }, paint: { 'line-color': 'rgb(0, 0, 0)', 'line-opacity': 0.5, 'line-dasharray': [3, 3] }, filter: ['all', ['==', 'brunnel', 'tunnel'], ['==', 'class', 'transit']] }, { id: 'railway', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', minzoom: 11, layout: { visibility: 'visible' }, paint: { 'line-color': 'rgb(0, 0, 0)', 'line-opacity': 0.5 }, filter: ['==', 'class', 'rail'] }, { id: 'railway_transit', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', layout: { visibility: 'visible' }, paint: { 'line-color': 'rgb(0, 0, 0)', 'line-opacity': 0.5 }, filter: ['all', ['==', 'class', 'transit'], ['!=', 'brunnel', 'tunnel']] }, { id: 'aeroway_taxiway', type: 'line', source: 'openmaptiles', 'source-layer': 'aeroway', minzoom: 12, layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'visible' }, paint: { 'line-color': 'rgb(50, 50, 50)', 'line-width': 1, 'line-opacity': 1 }, metadata: { 'mapbox:group': '1444849345966.4436' }, filter: ['all', ['in', 'class', 'taxiway']] }, { id: 'aeroway_runway', type: 'line', source: 'openmaptiles', 'source-layer': 'aeroway', minzoom: 4, layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'visible' }, paint: { 'line-color': 'rgb(50, 50, 50)', 'line-width': 5, 'line-opacity': 1 }, metadata: { 'mapbox:group': '1444849345966.4436' }, filter: ['all', ['in', 'class', 'runway']] }, { id: 'bridge_waterway', type: 'line', source: 'openmaptiles', 'source-layer': 'waterway', layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'none' }, paint: { 'line-color': 'hsl(205, 56%, 73%)', 'line-width': 1 }, filter: ['all', ['==', 'brunnel', 'bridge']] }, { id: 'bridge', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'visible' }, paint: { 'line-color': 'rgb(50, 50, 50)', 'line-width': { base: 1.4, stops: [[7, 0.5], [20, 28]] } }, filter: ['all', ['==', 'brunnel', 'bridge'], ['in', 'class', 'primary', 'secondary', 'tertiary', 'trunk']] }, { id: 'admin_sub', type: 'line', source: 'openmaptiles', 'source-layer': 'boundary', minzoom: 3, layout: { visibility: 'visible' }, paint: { 'line-color': 'rgba(59, 59, 59, 0.5)', 'line-width': 1.25, 'line-dasharray': [2, 1] }, filter: ['in', 'admin_level', 4, 6, 8] }, { id: 'admin_disputed', type: 'line', source: 'openmaptiles', 'source-layer': 'boundary', minzoom: 5, layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'visible' }, paint: { 'line-color': 'rgb(68, 68, 68)', 'line-width': 1, 'line-dasharray': [2, 2] }, filter: ['all', ['<=', 'admin_level', 2], ['==', '$type', 'LineString'], ['==', 'disputed', 1]] }, { id: 'admin_country', type: 'line', source: 'openmaptiles', 'source-layer': 'boundary', minzoom: 0, layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'visible' }, paint: { 'line-color': 'rgb(68, 68, 68)', 'line-width': 1 }, filter: ['all', ['<=', 'admin_level', 2], ['==', '$type', 'LineString'], ['!has', 'claimed_by']] }, { id: 'label_airport', type: 'symbol', source: 'openmaptiles', 'source-layer': 'aerodrome_label', minzoom: 10, layout: { 'icon-size': 1, 'text-font': ['Noto Sans Regular'], 'text-size': 11, 'text-field': '{name:latin}\n{name:nonlatin}', visibility: 'visible', 'text-anchor': 'top', 'text-offset': [0, 0.5], 'text-max-width': 8 }, paint: { 'text-color': 'rgb(110, 110, 110)', 'text-halo-blur': 1, 'text-halo-color': 'rgba(0, 0, 0, 0.75)', 'text-halo-width': 1 }, filter: ['all', ['has', 'iata']] }, { id: 'label_road', type: 'symbol', source: 'openmaptiles', 'source-layer': 'transportation_name', minzoom: 13, layout: { 'text-font': ['Noto Sans Regular'], 'text-size': { base: 1.4, stops: [[10, 8], [20, 14]] }, 'text-field': '{name:latin} {name:nonlatin}', visibility: 'visible', 'text-transform': 'uppercase', 'symbol-placement': 'line', 'text-letter-spacing': 0.1, 'text-rotation-alignment': 'map' }, paint: { 'text-color': 'rgb(212, 212, 212)', 'text-halo-color': 'rgb(0, 0, 0)', 'text-halo-width': 2 }, filter: ['all', ['==', '$type', 'LineString'], ['!=', 'subclass', 'ferry']] }, { id: 'label_place_other', type: 'symbol', source: 'openmaptiles', 'source-layer': 'place', minzoom: 8, layout: { 'text-font': ['Noto Sans Regular'], 'text-size': { stops: [[6, 10], [12, 14]] }, 'text-field': '{name:latin}\n{name:nonlatin}', visibility: 'visible', 'text-anchor': 'center', 'text-max-width': 6 }, paint: { 'text-color': 'rgb(148, 148, 148)', 'text-halo-blur': 0, 'text-halo-color': 'rgb(0, 0, 0)', 'text-halo-width': 2 }, filter: ['all', ['==', '$type', 'Point'], ['!in', 'class', 'city', 'state', 'country', 'continent']] }, { id: 'label_place_city', type: 'symbol', source: 'openmaptiles', 'source-layer': 'place', maxzoom: 16, layout: { 'text-font': ['Noto Sans Regular'], 'text-size': { stops: [[3, 11], [8, 16]] }, 'text-field': '{name:latin}\n{name:nonlatin}', 'text-max-width': 10 }, paint: { 'text-color': 'rgb(212, 212, 212)', 'text-halo-blur': 0, 'text-halo-color': 'rgba(0, 0, 0, 0.75)', 'text-halo-width': 2 }, filter: ['all', ['==', '$type', 'Point'], ['==', 'class', 'city']] }, { id: 'label_country_other', type: 'symbol', source: 'openmaptiles', 'source-layer': 'place', maxzoom: 12, layout: { 'text-font': ['Noto Sans Regular'], 'text-size': { stops: [[3, 12], [8, 22]] }, 'text-field': '{name:latin}', visibility: 'visible', 'text-max-width': 10 }, paint: { 'text-color': 'rgb(179, 179, 179)', 'text-halo-blur': 0, 'text-halo-color': 'rgba(0, 0, 0, 0.75)', 'text-halo-width': 2 }, filter: ['all', ['==', '$type', 'Point'], ['==', 'class', 'country'], ['!has', 'iso_a2']] }, { id: 'label_country', type: 'symbol', source: 'openmaptiles', 'source-layer': 'place', maxzoom: 12, layout: { 'text-font': ['Noto Sans Bold'], 'text-size': { stops: [[3, 12], [8, 22]] }, 'text-field': '{name:latin}', visibility: 'visible', 'text-max-width': 10 }, paint: { 'text-color': 'rgb(179, 179, 179)', 'text-halo-blur': 0, 'text-halo-color': 'rgba(0, 0, 0, 0.75)', 'text-halo-width': 2 }, filter: ['all', ['==', '$type', 'Point'], ['==', 'class', 'country'], ['has', 'iso_a2']] }],
     metadata: { 'maptiler:copyright': 'This style was generated on MapTiler Cloud. Usage outside of MapTiler Cloud or MapTiler Server requires valid MapTiler Data package: https://www.maptiler.com/data/ -- please contact us.' },
-    glyphs: 'static/Titles/fonts/{fontstack}/{range}.pbf?key=rB2y2a2rG8i9SEjOXQXl',
+    glyphs: '/static/Titles/fonts/{fontstack}/{range}.pbf?key=rB2y2a2rG8i9SEjOXQXl',
     sprite: 'https://www.maptiler.com/static/Titles/sprite',
     bearing: 0,
     pitch: 0,
diff --git a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
index baf465be0..7b3736b8c 100644
--- a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
+++ b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
@@ -856,7 +856,7 @@ export default {
             gridColor: '#ededed',
             lineWidth: 1,
             ruleColor: '#4e4e4e',
-            pens:[]
+            pens: []
           }
           this.projectInfoShow = true
           this.projectAlertShow = true
@@ -865,6 +865,7 @@ export default {
           data.ruleColor = this.theme == 'light' ? '#4e4e4e' : '#BEBEBE'
           resolve(data)
         } else {
+          delete data.origin
           data.ruleColor = this.theme == 'light' ? '#4e4e4e' : '#BEBEBE'
           if (data.data) {
             this.topologyInfo = {
diff --git a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
index a78bfdea6..0ccad75a8 100644
--- a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
+++ b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
@@ -429,7 +429,7 @@
                         :class="['nz-icon',bkTypeOption.find(item1=>item1.id==selection.pen.data.gradientType).label,bkTypeOption.find(item1=>item1.id==selection.pen.data.gradientType).fontSize]"></i>
                     </div>
 
-                    <el-option v-for="(item,index) in bkTypeOption" :value="item.id" :key="index">
+                    <el-option v-for="(item,index) in bkTypeOption" :value="item.id" :label="''" :key="index">
                       <i :class="['nz-icon',item.label,item.fontSize]"></i>
                     </el-option>
                     <!--el-input__inner-->
@@ -1546,6 +1546,7 @@ export default {
       if (value === 'lineDash') {
         this.selection.pen.lineDash = val ? (val == 1 ? [5, 5] : ((val == 2 ? [10, 10] : [10, 10, 2, 10]))) : []
       }
+      console.log(this.selection.pen)
       this.$emit('change', this.selection.pen)
       // if(!this.selection.pen.type||this.selection.pens){
       //   this.$emit('change',this.selection.pen||this.selection.pens);
diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue
index c127de7d6..ae0411d21 100644
--- a/nezha-fronted/src/components/common/project/topologyL5.vue
+++ b/nezha-fronted/src/components/common/project/topologyL5.vue
@@ -878,6 +878,7 @@ export default {
             resolve(data)
             data = null
           } else {
+            delete data.origin
             data.ruleColor = this.theme == 'light' ? '#4e4e4e' : '#f9f9f9'
             data.gridColor = this.theme == 'light' ? '#ededed' : '#090909'
             data.grid = false
@@ -1645,7 +1646,25 @@ export default {
     },
 
     onUpdateProps (node) { // 更新pen
-      getTopology(this.topologyIndex).setValue(node)
+      const obj = {
+        id: node.id,
+        x: node.x,
+        y: node.y,
+        data: node.data,
+        width: node.width,
+        height: node.height,
+        borderRadius: node.borderRadius,
+        rotate: node.rotate,
+        background: node.background,
+        iconColor: node.iconColor,
+        gradientType: node.gradientType,
+        gradientFromColor: node.gradientFromColor,
+        gradientToColor: node.gradientToColor,
+        globalAlpha: node.globalAlpha,
+        dash: node.dash,
+        strokeColor: node.strokeColor
+      }
+      getTopology(this.topologyIndex).setValue(obj)
     },
 
     handleAvatarSuccess () {
diff --git a/nezha-fronted/src/components/common/project/topologyMixin.js b/nezha-fronted/src/components/common/project/topologyMixin.js
index 37b0b9709..5e8f3ae16 100644
--- a/nezha-fronted/src/components/common/project/topologyMixin.js
+++ b/nezha-fronted/src/components/common/project/topologyMixin.js
@@ -117,7 +117,7 @@ export default {
         pen: null,
         pens: null
       }
-      if (!pens.length) return
+      if (!pens.length || !this.editTopologyFlag) return
       this.$nextTick(() => {
         if (pens.length == 1) {
           this.modulesDiff && this.modulesDiff(pens[0])

From dcfeadc9ca68e059b74a36103a752956ad3a1d42 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Mon, 5 Sep 2022 18:01:00 +0800
Subject: [PATCH 13/37] =?UTF-8?q?fix=20:=20=E8=A7=A3=E5=86=B3=20RecordRule?=
 =?UTF-8?q?=EF=BC=8CalertRule=E5=8F=B3=E4=BE=A7=E5=9B=BA=E5=AE=9A=E6=A0=8F?=
 =?UTF-8?q?view=E6=94=BE=E5=A4=A7=E5=85=B3=E9=97=AD=E5=90=8E=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=E7=9A=84=E9=AB=98=E5=BA=A6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/stylus/main.scss | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss
index f694dca52..a13dcc7ef 100644
--- a/nezha-fronted/src/assets/stylus/main.scss
+++ b/nezha-fronted/src/assets/stylus/main.scss
@@ -1083,7 +1083,11 @@ li {
   width:0 !important;
   background-color: $--background-color-base;
 }
-.nz-table .el-table__fixed, .nz-table .el-table__fixed-right {
+// .nz-table .el-table__fixed, .nz-table .el-table__fixed-right {
+//   height: 100% !important;
+//   z-index: 1;
+// }
+.nz-table .el-table__fixed, .nz-table,.nz-table-list .el-table__fixed-right {
   height: 100% !important;
   z-index: 1;
 }

From 58cc43894765b5615ce0b8dae733b7ee5e620819 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Tue, 6 Sep 2022 09:35:07 +0800
Subject: [PATCH 14/37] =?UTF-8?q?fix=20:=20issue=20recordRule=20=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=90=9C=E7=B4=A2=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/searchInput.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/searchInput.vue b/nezha-fronted/src/components/common/searchInput.vue
index 1f1db1055..dea7d17ab 100644
--- a/nezha-fronted/src/components/common/searchInput.vue
+++ b/nezha-fronted/src/components/common/searchInput.vue
@@ -1611,7 +1611,7 @@ export default {
         this.select_list.forEach(item => {
           if (item.listStr) {
             if (item.listStr == 'issue') {
-              item.valnum = item.val
+              item.valnum = JSON.parse(localStorage.getItem('nz-history-' + this.where))[0][0].valnum
               item.val = JSON.parse(localStorage.getItem('nz-history-' + this.where))[0][0].val
             } else {
               item.val = this[item.listStr].find(r => r.id == item.valnum).name

From de66cb460ee661e7877c425ad3e67938327a23d1 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 6 Sep 2022 10:11:56 +0800
Subject: [PATCH 15/37] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E6=97=A0=E6=B3=95=E9=A1=B5=E9=9D=A2=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/mixin/routerPathParams.js  | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/nezha-fronted/src/components/common/mixin/routerPathParams.js b/nezha-fronted/src/components/common/mixin/routerPathParams.js
index fb3e23efc..a90b3a506 100644
--- a/nezha-fronted/src/components/common/mixin/routerPathParams.js
+++ b/nezha-fronted/src/components/common/mixin/routerPathParams.js
@@ -53,20 +53,22 @@ export default {
         const detailType = this.detailType === 'list' ? 'dataList' : 'detailList'
         localStorage.setItem('detail-view-' + this.tableId, this.detailType)
         params.detailType = this.detailType
-        params.bottomBox = this.$refs[detailType].bottomBox.showSubList
-        if (this.detailType === 'list') {
+
+        if (this.detailType === 'list' && lodash.get(this, `this.$refs.${detailType}.bottomBox`)) {
+          params.bottomBox = this.$refs[detailType].bottomBox.showSubList
           params.targetTab = this.$refs[detailType].bottomBox.targetTab
         } else {
+          params.bottomBox = false
           params.targetTab = this.$route.query.targetTab
         }
-        if (this.detailType === 'list') {
+        if (this.detailType === 'list' && lodash.get(this, `this.$refs.${detailType}.bottomBox`)) {
           params.selectObj = JSON.stringify({
             id: this.$refs[detailType].bottomBox.object.id,
             name: this.$refs[detailType].bottomBox.object.name,
             config: this.$refs[detailType].bottomBox.object.config || '',
             childrenNum: this.$refs[detailType].bottomBox.object.childrenNum || ''
           })
-        } else {
+        } else if (lodash.get(this, `$refs.${detailType}.detailViewRightObj`)) {
           this.$nextTick(() => {
             params.selectObj = JSON.stringify({
               id: this.$refs[detailType].detailViewRightObj.id,
@@ -77,7 +79,7 @@ export default {
           })
         }
         this.$router.replace({ path: path, query: params }).catch(err => {})
-      } else if (from === 'nzDatalist') {
+      } else if (from === 'nzDatalist' && this.bottomBox) {
         params.bottomBox = this.bottomBox.showSubList
         params.targetTab = this.bottomBox.targetTab
         params.selectObj = JSON.stringify({
@@ -87,7 +89,7 @@ export default {
           childrenNum: this.bottomBox.object.childrenNum || ''
         })
         this.$router.replace({ path: path, query: params }).catch(err => {})
-      } else if (from === 'nzDetailList') {
+      } else if (from === 'nzDetailList' && this.detailViewRightObj) {
         params.targetTab = this.$route.query.targetTab
         params.selectObj = JSON.stringify({
           id: this.detailViewRightObj.id,
@@ -96,7 +98,7 @@ export default {
           childrenNum: this.detailViewRightObj.childrenNum || ''
         })
         this.$router.replace({ path: path, query: params }).catch(err => {})
-      } else if (from === 'bottomBox') {
+      } else if (from === 'bottomBox' && this.targetTab) {
         params.targetTab = this.targetTab
         this.$router.replace({ path: path, query: params }).catch(err => {})
       }

From e3e62b3b09c54011cafdfbac8826770e88979a1d Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 6 Sep 2022 13:56:20 +0800
Subject: [PATCH 16/37] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=B0=E8=AF=A6=E7=BB=86=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E6=97=B6=20=E8=B7=AF=E7=94=B1=E7=BB=91=E5=AE=9A=E5=AF=B9?=
 =?UTF-8?q?=E8=B1=A1=E6=9C=AA=E5=8F=98=E5=8C=96=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  1 +
 nezha-fronted/package-lock.json               | 76 +++++++++----------
 nezha-fronted/package.json                    |  2 +-
 .../common/ChartDiagram/diagram.vue           | 10 ++-
 .../common/mixin/detailViewMixin.js           |  1 +
 .../components/common/project/topologyL5.vue  | 27 +++----
 6 files changed, 59 insertions(+), 58 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5b014fbc1..d27e6fa15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ nezha-fronted/src/components/common/rightBox/tempRoghtBox.vue
 nezha-fronted/exportHtml/
 nezha-fronted/src/a.txt
 nezha-fronted/src/components/common/testTopology.vue
+nezha-fronted/static/
diff --git a/nezha-fronted/package-lock.json b/nezha-fronted/package-lock.json
index 5dc85bc4b..767e9aa90 100644
--- a/nezha-fronted/package-lock.json
+++ b/nezha-fronted/package-lock.json
@@ -1401,7 +1401,7 @@
     },
     "@mapbox/geojson-rewind": {
       "version": "0.5.2",
-      "resolved": "https://registry.npmmirror.com/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz",
+      "resolved": "https://registry.npmjs.org/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz",
       "integrity": "sha512-tJaT+RbYGJYStt7wI3cq4Nl4SXxG8W7JDG5DMJu97V25RnbNg3QtQtf+KD+VLjNpWKYsRvXDNmNrBgEETr1ifA==",
       "requires": {
         "get-stream": "^6.0.1",
@@ -1410,44 +1410,44 @@
       "dependencies": {
         "get-stream": {
           "version": "6.0.1",
-          "resolved": "https://registry.npmmirror.com/get-stream/-/get-stream-6.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
           "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="
         },
         "minimist": {
           "version": "1.2.6",
-          "resolved": "https://registry.npmmirror.com/minimist/-/minimist-1.2.6.tgz",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
           "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
         }
       }
     },
     "@mapbox/jsonlint-lines-primitives": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmmirror.com/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz",
       "integrity": "sha512-rY0o9A5ECsTQRVhv7tL/OyDpGAoUB4tTvLiW1DSzQGq4bvTPhNw1VpSNjDJc5GFZ2XuyOtSWSVN05qOtcD71qQ=="
     },
     "@mapbox/mapbox-gl-supported": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmmirror.com/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-2.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-2.0.1.tgz",
       "integrity": "sha512-HP6XvfNIzfoMVfyGjBckjiAOQK9WfX0ywdLubuPMPv+Vqf5fj0uCbgBQYpiqcWZT6cbyyRnTSXDheT1ugvF6UQ=="
     },
     "@mapbox/point-geometry": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmmirror.com/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz",
       "integrity": "sha512-6j56HdLTwWGO0fJPlrZtdU/B13q8Uwmo18Ck2GnGgN9PCFyKTZ3UbXeEdRFh18i9XQ92eH2VdtpJHpBD3aripQ=="
     },
     "@mapbox/tiny-sdf": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmmirror.com/@mapbox/tiny-sdf/-/tiny-sdf-2.0.5.tgz",
+      "resolved": "https://registry.npmjs.org/@mapbox/tiny-sdf/-/tiny-sdf-2.0.5.tgz",
       "integrity": "sha512-OhXt2lS//WpLdkqrzo/KwB7SRD8AiNTFFzuo9n14IBupzIMa67yGItcK7I2W9D8Ghpa4T04Sw9FWsKCJG50Bxw=="
     },
     "@mapbox/unitbezier": {
       "version": "0.0.1",
-      "resolved": "https://registry.npmmirror.com/@mapbox/unitbezier/-/unitbezier-0.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/@mapbox/unitbezier/-/unitbezier-0.0.1.tgz",
       "integrity": "sha512-nMkuDXFv60aBr9soUG5q+GvZYL+2KZHVvsqFCzqnkGEf46U2fvmytHaEVc1/YZbiLn8X+eR3QzX1+dwDO1lxlw=="
     },
     "@mapbox/vector-tile": {
       "version": "1.3.1",
-      "resolved": "https://registry.npmmirror.com/@mapbox/vector-tile/-/vector-tile-1.3.1.tgz",
+      "resolved": "https://registry.npmjs.org/@mapbox/vector-tile/-/vector-tile-1.3.1.tgz",
       "integrity": "sha512-MCEddb8u44/xfQ3oD+Srl/tNcQoqTw3goGk2oLsrFxOTc3dUp+kAnby3PvAeeBYSMSjSPD1nd1AJA6W49WnoUw==",
       "requires": {
         "@mapbox/point-geometry": "~0.1.0"
@@ -1455,7 +1455,7 @@
     },
     "@mapbox/whoots-js": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmmirror.com/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz",
       "integrity": "sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q=="
     },
     "@riophae/vue-treeselect": {
@@ -1507,9 +1507,9 @@
       "integrity": "sha512-pFCGC7pBorMA8kPiAPKLeBp9VjHXs8FRMujTjFAUpJxQGRAZzjnuVq0pB32me9Vc/Ckp1/pH6S0JgD+poVA5CA=="
     },
     "@topology/core": {
-      "version": "1.1.32",
-      "resolved": "https://registry.npmjs.org/@topology/core/-/core-1.1.32.tgz",
-      "integrity": "sha512-ZpRzW0ERxBMFcdujT7VpZVY8t7B+OEMXVhuY+vQ8a++LTG/SIWT3ib8EhYw4cJM4BaIUtOOyDPYHpFk4SOl0KA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@topology/core/-/core-1.2.0.tgz",
+      "integrity": "sha512-4CCg9utyJTSNNtmqWG7895ongEWGz4mHwwkKy8MGM4cQSzgC2S615XQgwiLMPjMxSUL0OOQkI9oU4wei/gTPuA==",
       "requires": {
         "mitt": "^2.1.0",
         "mqtt": "^4.2.6"
@@ -1573,7 +1573,7 @@
     },
     "@types/geojson": {
       "version": "7946.0.10",
-      "resolved": "https://registry.npmmirror.com/@types/geojson/-/geojson-7946.0.10.tgz",
+      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.10.tgz",
       "integrity": "sha512-Nmh0K3iWQJzniTuPRcJn5hxXkfB1T1pgB89SBig5PlJQU5yocazeu4jATJlaA0GYFKWMqDdvYemoSnF2pXgLVA=="
     },
     "@types/istanbul-lib-coverage": {
@@ -1609,12 +1609,12 @@
     },
     "@types/mapbox__point-geometry": {
       "version": "0.1.2",
-      "resolved": "https://registry.npmmirror.com/@types/mapbox__point-geometry/-/mapbox__point-geometry-0.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@types/mapbox__point-geometry/-/mapbox__point-geometry-0.1.2.tgz",
       "integrity": "sha512-D0lgCq+3VWV85ey1MZVkE8ZveyuvW5VAfuahVTQRpXFQTxw03SuIf1/K4UQ87MMIXVKzpFjXFiFMZzLj2kU+iA=="
     },
     "@types/mapbox__vector-tile": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmmirror.com/@types/mapbox__vector-tile/-/mapbox__vector-tile-1.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/@types/mapbox__vector-tile/-/mapbox__vector-tile-1.3.0.tgz",
       "integrity": "sha512-kDwVreQO5V4c8yAxzZVQLE5tyWF+IPToAanloQaSnwfXmIcJ7cyOrv8z4Ft4y7PsLYmhWXmON8MBV8RX0Rgr8g==",
       "requires": {
         "@types/geojson": "*",
@@ -1624,7 +1624,7 @@
     },
     "@types/pbf": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmmirror.com/@types/pbf/-/pbf-3.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/@types/pbf/-/pbf-3.0.2.tgz",
       "integrity": "sha512-EDrLIPaPXOZqDjrkzxxbX7UlJSeQVgah3i0aA4pOSzmK9zq3BIh7/MZIQxED7slJByvKM4Gc6Hypyu2lJzh3SQ=="
     },
     "@types/q": {
@@ -4071,7 +4071,7 @@
     },
     "clipboard": {
       "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.11.tgz",
+      "resolved": "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz",
       "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
       "requires": {
         "good-listener": "^1.2.2",
@@ -5014,7 +5014,7 @@
     },
     "csscolorparser": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmmirror.com/csscolorparser/-/csscolorparser-1.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/csscolorparser/-/csscolorparser-1.0.3.tgz",
       "integrity": "sha512-umPSgYwZkdFoUrH5hIq5kf0wPSXiro51nPw0j2K/c83KflkPSTBGMz6NJvMB+07VlL0y7VPo6QJcDjcgKTTm3w=="
     },
     "cssesc": {
@@ -6245,7 +6245,7 @@
     },
     "delegate": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz",
       "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
     },
     "delegates": {
@@ -6481,7 +6481,7 @@
     },
     "earcut": {
       "version": "2.2.4",
-      "resolved": "https://registry.npmmirror.com/earcut/-/earcut-2.2.4.tgz",
+      "resolved": "https://registry.npmjs.org/earcut/-/earcut-2.2.4.tgz",
       "integrity": "sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ=="
     },
     "easings-css": {
@@ -8375,7 +8375,7 @@
     },
     "geojson-vt": {
       "version": "3.2.1",
-      "resolved": "https://registry.npmmirror.com/geojson-vt/-/geojson-vt-3.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/geojson-vt/-/geojson-vt-3.2.1.tgz",
       "integrity": "sha512-EvGQQi/zPrDA6zr6BnJD/YhwAkBP8nnJ9emh3EnHQKVMfg/MRVtPbMYdgVy/IaEmn4UfagD2a6fafPDL5hbtwg=="
     },
     "get-caller-file": {
@@ -8427,7 +8427,7 @@
     },
     "gl-matrix": {
       "version": "3.4.3",
-      "resolved": "https://registry.npmmirror.com/gl-matrix/-/gl-matrix-3.4.3.tgz",
+      "resolved": "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.4.3.tgz",
       "integrity": "sha512-wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA=="
     },
     "glob": {
@@ -8572,7 +8572,7 @@
     },
     "good-listener": {
       "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
+      "resolved": "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz",
       "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==",
       "requires": {
         "delegate": "^3.1.2"
@@ -11057,7 +11057,7 @@
     },
     "kdbush": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmmirror.com/kdbush/-/kdbush-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/kdbush/-/kdbush-3.0.0.tgz",
       "integrity": "sha512-hRkd6/XW4HTsA9vjVpY9tuXJYLSlelnkTmVFu4M9/7MIYQtFcHpbugAU7UbOfjOiVSVYl2fqgBuJ32JUmRo5Ew=="
     },
     "keyv": {
@@ -11415,7 +11415,7 @@
     },
     "maplibre-gl": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmmirror.com/maplibre-gl/-/maplibre-gl-2.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-2.2.0.tgz",
       "integrity": "sha512-5LB7ROIxvBADPa4PmU2j+mp0jG5IIbEidCOyZEXVbEriluMJn0hz28vszVb4Cr2IA4YQ9cnERqjHaf33MHIRBQ==",
       "requires": {
         "@mapbox/geojson-rewind": "^0.5.2",
@@ -11935,7 +11935,7 @@
     },
     "murmurhash-js": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmmirror.com/murmurhash-js/-/murmurhash-js-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/murmurhash-js/-/murmurhash-js-1.0.0.tgz",
       "integrity": "sha512-TvmkNhkv8yct0SVBSy+o8wYzXjE4Zz3PCesbfs8HiCXXdcTuocApFv11UWlNFWKYsP2okqrhb7JNlSm9InBhIw=="
     },
     "mv": {
@@ -12862,7 +12862,7 @@
     },
     "pbf": {
       "version": "3.2.1",
-      "resolved": "https://registry.npmmirror.com/pbf/-/pbf-3.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/pbf/-/pbf-3.2.1.tgz",
       "integrity": "sha512-ClrV7pNOn7rtmoQVF4TS1vyU0WhYRnP92fzbfF75jAIwpnzdJXf8iTd4CMEqO4yUenH6NDqLiwjqlh6QgZzgLQ==",
       "requires": {
         "ieee754": "^1.1.12",
@@ -15303,7 +15303,7 @@
     },
     "potpack": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmmirror.com/potpack/-/potpack-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/potpack/-/potpack-1.0.2.tgz",
       "integrity": "sha512-choctRBIV9EMT9WGAZHn3V7t0Z2pMQyl0EZE6pFc/6ml3ssw7Dlf/oAOvFwjm1HVsqfQN8GfeFyJ+d8tRzqueQ=="
     },
     "preload": {
@@ -15452,7 +15452,7 @@
     },
     "protocol-buffers-schema": {
       "version": "3.6.0",
-      "resolved": "https://registry.npmmirror.com/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz",
+      "resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz",
       "integrity": "sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw=="
     },
     "proxy-addr": {
@@ -15574,7 +15574,7 @@
     },
     "quickselect": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmmirror.com/quickselect/-/quickselect-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/quickselect/-/quickselect-2.0.0.tgz",
       "integrity": "sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw=="
     },
     "quill": {
@@ -16069,7 +16069,7 @@
     },
     "resolve-protobuf-schema": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmmirror.com/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz",
       "integrity": "sha512-kI5ffTiZWmJaS/huM8wZfEMer1eRd7oJQhDuxeCLe3t7N7mX3z94CN0xPxBQxFYQTSNz9T0i+v6inKqSdK8xrQ==",
       "requires": {
         "protocol-buffers-schema": "^3.3.1"
@@ -16560,7 +16560,7 @@
     },
     "select": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/select/-/select-1.1.2.tgz",
       "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA=="
     },
     "select-hose": {
@@ -17572,7 +17572,7 @@
     },
     "supercluster": {
       "version": "7.1.5",
-      "resolved": "https://registry.npmmirror.com/supercluster/-/supercluster-7.1.5.tgz",
+      "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-7.1.5.tgz",
       "integrity": "sha512-EulshI3pGUM66o6ZdH3ReiFcvHpM3vAigyK+vcxdjpJyEbIIrtbmBdY23mGgnI24uXiGFvrGq9Gkum/8U7vJWg==",
       "requires": {
         "kdbush": "^3.0.0"
@@ -18044,7 +18044,7 @@
     },
     "tiny-emitter": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
       "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
     },
     "tinycolor2": {
@@ -18054,7 +18054,7 @@
     },
     "tinyqueue": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmmirror.com/tinyqueue/-/tinyqueue-2.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/tinyqueue/-/tinyqueue-2.0.3.tgz",
       "integrity": "sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA=="
     },
     "tmp": {
@@ -18728,7 +18728,7 @@
     },
     "vt-pbf": {
       "version": "3.1.3",
-      "resolved": "https://registry.npmmirror.com/vt-pbf/-/vt-pbf-3.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/vt-pbf/-/vt-pbf-3.1.3.tgz",
       "integrity": "sha512-2LzDFzt0mZKZ9IpVF2r69G9bXaP2Q2sArJCmcCgvfTdCCZzSyz4aCLoQyUilu37Ll56tCblIZrXFIjNUpGIlmA==",
       "requires": {
         "@mapbox/point-geometry": "0.1.0",
@@ -18743,7 +18743,7 @@
     },
     "vue-clipboard2": {
       "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/vue-clipboard2/-/vue-clipboard2-0.3.3.tgz",
+      "resolved": "https://registry.npmmirror.com/vue-clipboard2/-/vue-clipboard2-0.3.3.tgz",
       "integrity": "sha512-aNWXIL2DKgJyY/1OOeITwAQz1fHaCIGvUFHf9h8UcoQBG5a74MkdhS/xqoYe7DNZdQmZRL+TAdIbtUs9OyVjbw==",
       "requires": {
         "clipboard": "^2.0.0"
diff --git a/nezha-fronted/package.json b/nezha-fronted/package.json
index a4f4fd874..98851e730 100644
--- a/nezha-fronted/package.json
+++ b/nezha-fronted/package.json
@@ -28,7 +28,7 @@
     "@topology/activity-diagram": "^1.1.0",
     "@topology/chart-diagram": "^1.1.0",
     "@topology/class-diagram": "^1.1.0",
-    "@topology/core": "^1.1.34",
+    "@topology/core": "^1.1.38",
     "@topology/flow-diagram": "^1.1.1",
     "@topology/form-diagram": "^1.1.32",
     "@topology/sequence-diagram": "^1.1.0",
diff --git a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
index 697508dad..029921e26 100644
--- a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
+++ b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
@@ -1213,7 +1213,15 @@ export default {
     },
 
     onUpdateProps (node) {
-      getTopology(this.topologyIndex).setValue(node)
+      let obj = this.$loadsh.cloneDeep(node)
+      delete obj.x
+      delete obj.y
+      delete obj.center
+      delete obj.ex
+      delete obj.ey
+      delete obj.width
+      delete obj.height
+      getTopology(this.topologyIndex).setValue(obj)
     },
 
     handleAvatarSuccess () {
diff --git a/nezha-fronted/src/components/common/mixin/detailViewMixin.js b/nezha-fronted/src/components/common/mixin/detailViewMixin.js
index 896776d91..1043999f5 100644
--- a/nezha-fronted/src/components/common/mixin/detailViewMixin.js
+++ b/nezha-fronted/src/components/common/mixin/detailViewMixin.js
@@ -2,6 +2,7 @@ export default {
   props: {},
   watch: {
     detailViewRightObj: {
+      immediate: true,
       handler (n) {
         if (n) {
           this.updatePath(this.$route.query, this.$route.path, 'nzDetailList')
diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue
index ae0411d21..5d4e3d857 100644
--- a/nezha-fronted/src/components/common/project/topologyL5.vue
+++ b/nezha-fronted/src/components/common/project/topologyL5.vue
@@ -1646,24 +1646,15 @@ export default {
     },
 
     onUpdateProps (node) { // 更新pen
-      const obj = {
-        id: node.id,
-        x: node.x,
-        y: node.y,
-        data: node.data,
-        width: node.width,
-        height: node.height,
-        borderRadius: node.borderRadius,
-        rotate: node.rotate,
-        background: node.background,
-        iconColor: node.iconColor,
-        gradientType: node.gradientType,
-        gradientFromColor: node.gradientFromColor,
-        gradientToColor: node.gradientToColor,
-        globalAlpha: node.globalAlpha,
-        dash: node.dash,
-        strokeColor: node.strokeColor
-      }
+      let obj = this.$loadsh.cloneDeep(node)
+      console.log(obj)
+      delete obj.x
+      delete obj.y
+      delete obj.center
+      delete obj.ex
+      delete obj.ey
+      delete obj.width
+      delete obj.height
       getTopology(this.topologyIndex).setValue(obj)
     },
 

From 4a6ad5ea9d74548b81b39444d3068eea23b3ed8c Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 6 Sep 2022 14:07:12 +0800
Subject: [PATCH 17/37] =?UTF-8?q?fix=EF=BC=9A=E5=A4=84=E7=90=86alertLabel?=
 =?UTF-8?q?=E7=9A=84=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/alert/alertLabel.vue         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/components/common/alert/alertLabel.vue b/nezha-fronted/src/components/common/alert/alertLabel.vue
index 2a0b932ec..1b56c5aab 100644
--- a/nezha-fronted/src/components/common/alert/alertLabel.vue
+++ b/nezha-fronted/src/components/common/alert/alertLabel.vue
@@ -52,7 +52,7 @@
         <div class="document-copy-block">
           <div class="alert-label-title">{{$t('overall.name')}}</div>
           <div class="alert-label-value document-copy-text">{{alertLabelData && alertLabelData.name ? alertLabelData.name : '--'}}</div>
-          <i v-if="alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertLabelData.name)" :title="$t('overall.copyText')"></i>
+          <i v-if="alertLabelData && alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertLabelData.name)" :title="$t('overall.copyText')"></i>
          </div>
       </div>
        <!-- <div class="alert-label-box name-labe">
@@ -218,7 +218,7 @@
            <div class="alert-label-value document-copy-text">
              {{ alertLabelData && alertLabelData.name ? alertLabelData.name : "--" }}
            </div>
-           <i v-if="alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertLabelData.name)" :title="$t('overall.copyText')"></i>
+           <i v-if="alertLabelData && alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertLabelData.name)" :title="$t('overall.copyText')"></i>
          </div>
       </div>
       <div class="alert-label-box">
@@ -314,7 +314,7 @@
            <div class="alert-label-value document-copy-text">
              {{ alertLabelData && alertLabelData.name ? alertLabelData.name : "--" }}
            </div>
-           <i v-if="alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertLabelData.name)" :title="$t('overall.copyText')"></i>
+           <i v-if="alertLabelData && alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertLabelData.name)" :title="$t('overall.copyText')"></i>
          </div>
       </div>
       <div class="alert-label-box">
@@ -412,7 +412,7 @@
         <div class="alert-label-value document-copy-text">
           {{ alertLabelData && alertLabelData.name ? alertLabelData.name : "--" }}
         </div>
-          <i v-if="alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertLabelData.name)" :title="$t('overall.copyText')"></i>
+          <i v-if="alertLabelData && alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertLabelData.name)" :title="$t('overall.copyText')"></i>
          </div>
       </div>
       <div class="alert-label-box">
@@ -547,7 +547,7 @@
            <div class="alert-label-value document-copy-text">
              {{ alertLabelData && alertLabelData.name ? alertLabelData.name : "--" }}
            </div>
-           <i v-if="alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertLabelData.name)" :title="$t('overall.copyText')"></i>
+           <i v-if="alertLabelData && alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertLabelData.name)" :title="$t('overall.copyText')"></i>
          </div>
       </div>
       <div class="alert-label-box">

From c47262ea792a6e26500be6c9312d557b4c40a0b7 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 6 Sep 2022 14:34:33 +0800
Subject: [PATCH 18/37] =?UTF-8?q?fix=EF=BC=9A=20=E4=BF=AE=E5=A4=8D=20?=
 =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=20=E5=8F=AA=E8=83=BD=E5=9B=9E?=
 =?UTF-8?q?=E9=80=80=E4=B8=80=E6=AC=A1=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/layout/header.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/layout/header.vue b/nezha-fronted/src/components/layout/header.vue
index bedcce106..adc0964a1 100644
--- a/nezha-fronted/src/components/layout/header.vue
+++ b/nezha-fronted/src/components/layout/header.vue
@@ -199,10 +199,10 @@ export default {
         this.username = localStorage.getItem('nz-username')
         // this.refreshLang()
       })
-      if (window.history && window.history.pushState) {
-        history.pushState(null, null, document.URL)
-        window.addEventListener('popstate', this.cancel, false)
-      }
+      // if (window.history && window.history.pushState) {
+      //   history.pushState(null, null, document.URL)
+      //   window.addEventListener('popstate', this.cancel, false)
+      // }
       bus.$on('link-data-change', () => {
         this.getLinkData()
       })

From ad138b4f52cab044060041ef7e056a11661a92a3 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 6 Sep 2022 16:15:51 +0800
Subject: [PATCH 19/37] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8Dendpoint=20?=
 =?UTF-8?q?=E5=BA=95=E5=BC=B9=E7=AA=97=E6=97=A0=E6=B3=95=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1=E6=89=93=E5=BC=80=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/mixin/routerPathParams.js          | 115 +++++++++---------
 nezha-fronted/static/config.json              |   2 +-
 2 files changed, 59 insertions(+), 58 deletions(-)

diff --git a/nezha-fronted/src/components/common/mixin/routerPathParams.js b/nezha-fronted/src/components/common/mixin/routerPathParams.js
index a90b3a506..92a58a3c2 100644
--- a/nezha-fronted/src/components/common/mixin/routerPathParams.js
+++ b/nezha-fronted/src/components/common/mixin/routerPathParams.js
@@ -43,65 +43,66 @@ export default {
     },
     // 更新path，包含请求参数
     updatePath (param, path, from) {
-      const params = lodash.cloneDeep(param)
-      Object.keys(params).forEach(key => {
-        if (!params[key]) {
-          delete params[key]
+      this.$nextTick(() => {
+        const params = lodash.cloneDeep(param)
+        Object.keys(params).forEach(key => {
+          if (!params[key]) {
+            delete params[key]
+          }
+        })
+        if (!from) {
+          const detailType = this.detailType === 'list' ? 'dataList' : 'detailList'
+          localStorage.setItem('detail-view-' + this.tableId, this.detailType)
+          params.detailType = this.detailType
+          if (this.detailType === 'list' && this.$refs[detailType]) {
+            params.bottomBox = this.$refs[detailType].bottomBox.showSubList
+            params.targetTab = this.$refs[detailType].bottomBox.targetTab
+          } else {
+            params.bottomBox = false
+            params.targetTab = this.$route.query.targetTab
+          }
+          if (this.detailType === 'list' && this.$refs[detailType]) {
+            params.selectObj = JSON.stringify({
+              id: this.$refs[detailType].bottomBox.object.id,
+              name: this.$refs[detailType].bottomBox.object.name,
+              configs: this.$refs[detailType].bottomBox.object.configs ? this.$refs[detailType].bottomBox.object.configs.map(item => { return { type: item.type, enable: item.enable } }) : '',
+              childrenNum: this.$refs[detailType].bottomBox.object.childrenNum || ''
+            })
+          } else if (this.$refs[detailType] && this.$refs[detailType].detailViewRightObj) {
+            this.$nextTick(() => {
+              params.selectObj = JSON.stringify({
+                id: this.$refs[detailType].detailViewRightObj.id,
+                name: this.$refs[detailType].detailViewRightObj.name,
+                configs: this.$refs[detailType].detailViewRightObj.configs ? this.$refs[detailType].detailViewRightObj.configs.map(item => { return { type: item.type, enable: item.enable } }) : '',
+                childrenNum: this.$refs[detailType].detailViewRightObj.childrenNum || ''
+              })
+            })
+          }
+          this.$router.replace({ path: path, query: params }).catch(err => {})
+        } else if (from === 'nzDatalist' && this.bottomBox) {
+          params.bottomBox = this.bottomBox.showSubList
+          params.targetTab = this.bottomBox.targetTab
+          params.selectObj = JSON.stringify({
+            id: this.bottomBox.object.id,
+            name: this.bottomBox.object.name,
+            configs: this.bottomBox.object.configs ? this.bottomBox.object.configs.map(item => { return { type: item.type, enable: item.enable } }) : '',
+            childrenNum: this.bottomBox.object.childrenNum || ''
+          })
+          this.$router.replace({ path: path, query: params }).catch(err => {})
+        } else if (from === 'nzDetailList' && this.detailViewRightObj) {
+          params.targetTab = this.$route.query.targetTab
+          params.selectObj = JSON.stringify({
+            id: this.detailViewRightObj.id,
+            name: this.detailViewRightObj.name,
+            configs: this.detailViewRightObj.configs ? this.detailViewRightObj.configs.map(item => { return { type: item.type, enable: item.enable } }) : '',
+            childrenNum: this.detailViewRightObj.childrenNum || ''
+          })
+          this.$router.replace({ path: path, query: params }).catch(err => {})
+        } else if (from === 'bottomBox' && this.targetTab) {
+          params.targetTab = this.targetTab
+          this.$router.replace({ path: path, query: params }).catch(err => {})
         }
       })
-      if (!from) {
-        const detailType = this.detailType === 'list' ? 'dataList' : 'detailList'
-        localStorage.setItem('detail-view-' + this.tableId, this.detailType)
-        params.detailType = this.detailType
-
-        if (this.detailType === 'list' && lodash.get(this, `this.$refs.${detailType}.bottomBox`)) {
-          params.bottomBox = this.$refs[detailType].bottomBox.showSubList
-          params.targetTab = this.$refs[detailType].bottomBox.targetTab
-        } else {
-          params.bottomBox = false
-          params.targetTab = this.$route.query.targetTab
-        }
-        if (this.detailType === 'list' && lodash.get(this, `this.$refs.${detailType}.bottomBox`)) {
-          params.selectObj = JSON.stringify({
-            id: this.$refs[detailType].bottomBox.object.id,
-            name: this.$refs[detailType].bottomBox.object.name,
-            config: this.$refs[detailType].bottomBox.object.config || '',
-            childrenNum: this.$refs[detailType].bottomBox.object.childrenNum || ''
-          })
-        } else if (lodash.get(this, `$refs.${detailType}.detailViewRightObj`)) {
-          this.$nextTick(() => {
-            params.selectObj = JSON.stringify({
-              id: this.$refs[detailType].detailViewRightObj.id,
-              name: this.$refs[detailType].detailViewRightObj.name,
-              config: this.$refs[detailType].detailViewRightObj.config || '',
-              childrenNum: this.$refs[detailType].detailViewRightObj.childrenNum || ''
-            })
-          })
-        }
-        this.$router.replace({ path: path, query: params }).catch(err => {})
-      } else if (from === 'nzDatalist' && this.bottomBox) {
-        params.bottomBox = this.bottomBox.showSubList
-        params.targetTab = this.bottomBox.targetTab
-        params.selectObj = JSON.stringify({
-          id: this.bottomBox.object.id,
-          name: this.bottomBox.object.name,
-          config: this.bottomBox.object.config || '',
-          childrenNum: this.bottomBox.object.childrenNum || ''
-        })
-        this.$router.replace({ path: path, query: params }).catch(err => {})
-      } else if (from === 'nzDetailList' && this.detailViewRightObj) {
-        params.targetTab = this.$route.query.targetTab
-        params.selectObj = JSON.stringify({
-          id: this.detailViewRightObj.id,
-          name: this.detailViewRightObj.name,
-          config: this.detailViewRightObj.config || '',
-          childrenNum: this.detailViewRightObj.childrenNum || ''
-        })
-        this.$router.replace({ path: path, query: params }).catch(err => {})
-      } else if (from === 'bottomBox' && this.targetTab) {
-        params.targetTab = this.targetTab
-        this.$router.replace({ path: path, query: params }).catch(err => {})
-      }
     },
     setSearchInput (val, qv) {
       let dataList = ''
diff --git a/nezha-fronted/static/config.json b/nezha-fronted/static/config.json
index 3151969db..b9b43a208 100644
--- a/nezha-fronted/static/config.json
+++ b/nezha-fronted/static/config.json
@@ -1 +1 @@
-{"baseUrl":"http://192.168.40.42:8080/", "version": "22.05"}
+{"baseUrl":"http://192.168.40.42/", "version": "22.05"}

From 56822eb7ffd60d4c9be913b266bdcf26c6838917 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 6 Sep 2022 17:46:23 +0800
Subject: [PATCH 20/37] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=20bottomBox=20=E6=9C=AA=E7=9B=91=E5=90=AC?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/searchInput.vue  |  8 +++++++-
 .../src/components/common/searchSelectInfo.js        | 12 ++++++++++++
 .../src/components/common/table/nzDataList.vue       |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/common/searchInput.vue b/nezha-fronted/src/components/common/searchInput.vue
index dea7d17ab..6368c611e 100644
--- a/nezha-fronted/src/components/common/searchInput.vue
+++ b/nezha-fronted/src/components/common/searchInput.vue
@@ -968,6 +968,8 @@ export default {
               objectInfo.type = val.valnum
             } else if (val.label === 'issueState') {
               objectInfo.state = val.valnum
+            } else if (val.label === 'silenceState') {
+              objectInfo.state = val.valnum
             } else if (val.label === 'priority') {
               objectInfo.priority = val.valnum
             } else if (typeof (val.valnum) === 'undefined' || val.valnum == '') {
@@ -1614,7 +1616,11 @@ export default {
               item.valnum = JSON.parse(localStorage.getItem('nz-history-' + this.where))[0][0].valnum
               item.val = JSON.parse(localStorage.getItem('nz-history-' + this.where))[0][0].val
             } else {
-              item.val = this[item.listStr].find(r => r.id == item.valnum).name
+              if (this.selectInfoList[item.listStr]) {
+                item.val = this.selectInfoList[item.listStr].find(r => r.value == item.valnum).label
+              } else {
+                item.val = this[item.listStr].find(r => r.id == item.valnum).name
+              }
             }
           }
         })
diff --git a/nezha-fronted/src/components/common/searchSelectInfo.js b/nezha-fronted/src/components/common/searchSelectInfo.js
index df0bf2d35..c0336e815 100644
--- a/nezha-fronted/src/components/common/searchSelectInfo.js
+++ b/nezha-fronted/src/components/common/searchSelectInfo.js
@@ -347,6 +347,18 @@ export default {
             label: this.$t('overall.cancel')
           }
         ],
+        silenceState: [
+          {
+            value: 1,
+            label: this.$t('issue.open')
+          }, {
+            value: 2,
+            label: this.$t('issue.hasBeenAssigned')
+          }, {
+            value: 3,
+            label: this.$t('issue.beingProcessed')
+          }
+        ],
         priority: [
           {
             value: 1,
diff --git a/nezha-fronted/src/components/common/table/nzDataList.vue b/nezha-fronted/src/components/common/table/nzDataList.vue
index f911783b4..1fafe9299 100644
--- a/nezha-fronted/src/components/common/table/nzDataList.vue
+++ b/nezha-fronted/src/components/common/table/nzDataList.vue
@@ -220,7 +220,6 @@ export default {
       this.bottomBox.targetTab = targetTab
       this.bottomBox.object = JSON.parse(JSON.stringify(row))
       this.bottomBox.showSubList = true
-      this.updatePath(this.$route.query, this.$route.path, 'nzDatalist')
     },
     search (searchObj) {
       this.$emit('search', searchObj)
@@ -239,6 +238,7 @@ export default {
     'bottomBox.showSubList': function (n) {
       const vm = this
       bottomBoxWindow.showSubListWatch(vm, n)
+      this.updatePath(this.$route.query, this.$route.path, 'nzDatalist')
     },
     layout: {
       immediate: true,

From 95eb54546eb6658c79bdca984da161b2093e024e Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 6 Sep 2022 17:58:25 +0800
Subject: [PATCH 21/37] =?UTF-8?q?fix=EF=BC=9Asilence=20=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=A1=86=E6=B7=BB=E5=8A=A0=20state=E4=B8=8B=E6=8B=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/searchSelectInfo.js |   6 +-
 .../common/table/alert/alertSilenceTable.vue  | 130 +++----
 .../components/page/alert/alertSilence.vue    | 321 ++++++++++--------
 3 files changed, 239 insertions(+), 218 deletions(-)

diff --git a/nezha-fronted/src/components/common/searchSelectInfo.js b/nezha-fronted/src/components/common/searchSelectInfo.js
index c0336e815..60f93a66f 100644
--- a/nezha-fronted/src/components/common/searchSelectInfo.js
+++ b/nezha-fronted/src/components/common/searchSelectInfo.js
@@ -350,13 +350,13 @@ export default {
         silenceState: [
           {
             value: 1,
-            label: this.$t('issue.open')
+            label: this.$t('silence.active')
           }, {
             value: 2,
-            label: this.$t('issue.hasBeenAssigned')
+            label: this.$t('silence.pending')
           }, {
             value: 3,
-            label: this.$t('issue.beingProcessed')
+            label: this.$t('silence.expired')
           }
         ],
         priority: [
diff --git a/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue b/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue
index b046e1c45..27c917dd5 100644
--- a/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue
@@ -81,13 +81,13 @@
         </template>
         <template v-else-if="item.prop === 'state'">
           <span v-if="scope.row.state === 1" class="silence-active"
-            >active</span
+            >{{$t('silence.active')}}</span
           >
           <span v-if="scope.row.state === 2" class="silence-pending"
-            >pending</span
+            >{{$t('silence.pending')}}</span
           >
           <span v-if="scope.row.state === 3" class="silence-expired"
-            >expired</span
+            >{{$t('silence.expired')}}</span
           >
         </template>
         <template v-else-if="item.prop === 'utime'">
@@ -180,130 +180,130 @@
 </template>
 
 <script>
-import table from "@/components/common/mixin/table";
-import { calcDurationByStringTimeB } from "@/components/common/js/tools";
-import nzAlertTag from "../../../page/alert/nzAlertTag";
-import { sameLabels } from "@/components/common/js/constants";
+import table from '@/components/common/mixin/table'
+import { calcDurationByStringTimeB } from '@/components/common/js/tools'
+import nzAlertTag from '../../../page/alert/nzAlertTag'
+import { sameLabels } from '@/components/common/js/constants'
 export default {
-  name: "alertSilenceTable",
+  name: 'alertSilenceTable',
   components: {
-    nzAlertTag,
+    nzAlertTag
   },
   mixins: [table],
   props: {
     loading: Boolean,
-    nowTime: {},
+    nowTime: {}
   },
-  data() {
+  data () {
     return {
       /* 表格相关 */
       tableTitle: [
         {
-          label: "ID",
-          prop: "id",
+          label: 'ID',
+          prop: 'id',
           show: true,
           width: 80,
-          sortable: "custom",
+          sortable: 'custom'
         },
         {
-          label: this.$t("overall.name"),
-          prop: "name",
+          label: this.$t('overall.name'),
+          prop: 'name',
           show: true,
-          minWidth: 150,
+          minWidth: 150
         },
         {
-          label: this.$t("alert.silence.matchers"),
-          prop: "matchers",
+          label: this.$t('alert.silence.matchers'),
+          prop: 'matchers',
           show: true,
           minWidth: 200,
-          sortable: "custom",
+          sortable: 'custom'
         },
         {
-          label: this.$t("overall.startTime"),
-          prop: "startAt",
+          label: this.$t('overall.startTime'),
+          prop: 'startAt',
           show: true,
           width: 300,
-          sortable: "custom",
+          sortable: 'custom'
         },
         {
-          label: this.$t("config.terminallog.duration"),
-          prop: "duration",
+          label: this.$t('config.terminallog.duration'),
+          prop: 'duration',
           show: true,
-          width: 120,
+          width: 120
         },
         {
-          label: this.$t("overall.remark"),
-          prop: "remark",
+          label: this.$t('overall.remark'),
+          prop: 'remark',
           show: true,
-          width: 120,
+          width: 120
         },
         {
-          label: this.$t("alert.silence.upTime"),
-          prop: "utime",
+          label: this.$t('alert.silence.upTime'),
+          prop: 'utime',
           show: false,
-          width: 300,
+          width: 300
         },
         {
-          label: this.$t("alert.alert"),
-          prop: "alertNum",
+          label: this.$t('alert.alert'),
+          prop: 'alertNum',
           show: false,
           width: 120,
-          sortable: "custom",
+          sortable: 'custom'
         },
         {
-          label: this.$t("overall.state"),
-          prop: "state",
+          label: this.$t('overall.state'),
+          prop: 'state',
           show: true,
-          width: 120,
-        },
-      ],
-    };
+          width: 120
+        }
+      ]
+    }
   },
   computed: {
-    getDuration() {
+    getDuration () {
       return function (record) {
         if (record.endAt) {
-          return calcDurationByStringTimeB(record.startAt, record.endAt);
+          return calcDurationByStringTimeB(record.startAt, record.endAt)
         }
         return calcDurationByStringTimeB(
           record.startAt,
           this.utcTimeToTimezoneStr(this.nowTime)
-        );
-      };
+        )
+      }
     },
-    tagType() {
+    tagType () {
       return (key) => {
         if (sameLabels.find((item) => item === key)) {
-          return "normal";
+          return 'normal'
         } else {
-          return "info";
+          return 'info'
         }
-      };
-    },
+      }
+    }
   },
   methods: {
-    labelsSort(obj) {
-      obj = obj || [];
-      const buildIn = sameLabels;
-      if (typeof obj === "string") obj = JSON.parse(obj);
-      const labels = JSON.parse(JSON.stringify(obj));
-      const result = [];
-      const result2 = [];
+    labelsSort (obj) {
+      obj = obj || []
+      const buildIn = sameLabels
+      if (typeof obj === 'string') obj = JSON.parse(obj)
+      const labels = JSON.parse(JSON.stringify(obj))
+      const result = []
+      const result2 = []
       for (const key of buildIn) {
         labels.forEach((item) => {
           if (item.name === key) {
-            result.push(item);
+            result.push(item)
           }
-        });
+        })
       }
       labels.forEach((item) => {
         if (buildIn.indexOf(item.name) === -1) {
-          result2.push(item);
+          result2.push(item)
         }
-      });
+      })
       // console.log([...result, ...result2])
-      return [...result, ...result2];
-    },
-  },
-};
+      return [...result, ...result2]
+    }
+  }
+}
 </script>
diff --git a/nezha-fronted/src/components/page/alert/alertSilence.vue b/nezha-fronted/src/components/page/alert/alertSilence.vue
index fa38c87a9..479933bcb 100644
--- a/nezha-fronted/src/components/page/alert/alertSilence.vue
+++ b/nezha-fronted/src/components/page/alert/alertSilence.vue
@@ -109,153 +109,159 @@
 </template>
 
 <script>
-import bus from "@/libs/bus";
-import alertSilenceBox from "@/components/common/rightBox/alertSilenceBox";
-import deleteButton from "@/components/common/deleteButton";
-import nzDataList from "@/components/common/table/nzDataList";
-import dataListMixin from "@/components/common/mixin/dataList";
-import alertSilenceTable from "@/components/common/table/alert/alertSilenceTable";
-import routerPathParams from "@/components/common/mixin/routerPathParams";
+import bus from '@/libs/bus'
+import alertSilenceBox from '@/components/common/rightBox/alertSilenceBox'
+import deleteButton from '@/components/common/deleteButton'
+import nzDataList from '@/components/common/table/nzDataList'
+import dataListMixin from '@/components/common/mixin/dataList'
+import alertSilenceTable from '@/components/common/table/alert/alertSilenceTable'
+import routerPathParams from '@/components/common/mixin/routerPathParams'
 
 export default {
-  name: "alertSilence",
+  name: 'alertSilence',
   components: {
     alertSilenceTable,
     deleteButton,
     nzDataList,
-    alertSilenceBox,
+    alertSilenceBox
   },
   mixins: [dataListMixin, routerPathParams],
-  data() {
+  data () {
     return {
-      url: "alert/silence",
-      tableId: "silenceTable",
+      url: 'alert/silence',
+      tableId: 'silenceTable',
       /* 搜素相关 */
       searchMsg: {
         // 给搜索框子组件传递的信息
         zheze_none: true,
         searchLabelList: [
           {
-            name: "ID",
-            type: "input",
-            label: "ids",
-            disabled: false,
+            name: 'ID',
+            type: 'input',
+            label: 'ids',
+            disabled: false
           },
           {
-            name: this.$t("alert.silence.matchers"),
-            type: "input",
-            label: "matchers",
-            disabled: false,
+            name: this.$t('alert.silence.matchers'),
+            type: 'input',
+            label: 'matchers',
+            disabled: false
           },
-        ],
+          {
+            name: this.$t('overall.state'),
+            type: 'select',
+            label: 'silenceState',
+            disabled: false
+          }
+        ]
       },
       // 导出相关
-      importBox: { show: false, title: this.$t("overall.exportExcel") },
-      deleteBox: { show: false, ids: "", remark: "", state: 2 },
+      importBox: { show: false, title: this.$t('overall.exportExcel') },
+      deleteBox: { show: false, ids: '', remark: '', state: 2 },
       // 创建修改相关
       blankObject: {
-        id: "",
-        startAt: "",
-        endAt: "",
-        ruleId: "",
-        type: "asset",
-        linkId: "",
-        remark: "",
+        id: '',
+        startAt: '',
+        endAt: '',
+        ruleId: '',
+        type: 'asset',
+        linkId: '',
+        remark: '',
         time: [],
-        matchers: [{ name: "", value: "", regex: 0 }],
-        name: "",
+        matchers: [{ name: '', value: '', regex: 0 }],
+        name: ''
       },
-      nowTime: "",
-    };
+      nowTime: ''
+    }
   },
-  mounted() {
-    this.initEvent();
+  mounted () {
+    this.initEvent()
   },
   methods: {
-    queryMessage(alertRule) {
+    queryMessage (alertRule) {
       this.$refs.dataList.showBottomBox('alertRuleAlertMessage', alertRule)
     },
-    closeRightBox(refresh) {
-      this.rightBox.show = false;
-      this.copyFlag = false;
-      this.object = {};
+    closeRightBox (refresh) {
+      this.rightBox.show = false
+      this.copyFlag = false
+      this.object = {}
       if (refresh) {
-        this.delFlag = true;
-        this.getTableData();
+        this.delFlag = true
+        this.getTableData()
       }
     },
-    initEvent() {
-      bus.$on("alert-rule-list-change", () => {
-        this.getTableData();
-      });
-      bus.$on("dc-list-change", () => {
-        this.getTableData();
-      });
-      bus.$on("alert-message-change", () => {
-        this.getTableData();
-      });
+    initEvent () {
+      bus.$on('alert-rule-list-change', () => {
+        this.getTableData()
+      })
+      bus.$on('dc-list-change', () => {
+        this.getTableData()
+      })
+      bus.$on('alert-message-change', () => {
+        this.getTableData()
+      })
     },
-    exportCur() {
-      const searchLabel = Object.assign({}, this.searchLabel);
+    exportCur () {
+      const searchLabel = Object.assign({}, this.searchLabel)
       this.$set(
         searchLabel,
-        "language",
-        localStorage.getItem("nz-language")
-          ? localStorage.getItem("nz-language")
-          : "en"
-      );
-      this.exportExcel(searchLabel);
-      this.closeDialog();
+        'language',
+        localStorage.getItem('nz-language')
+          ? localStorage.getItem('nz-language')
+          : 'en'
+      )
+      this.exportExcel(searchLabel)
+      this.closeDialog()
     },
-    exportAll() {
-      const temp = JSON.parse(JSON.stringify(this.searchLabel));
-      temp.pageSize = -1;
+    exportAll () {
+      const temp = JSON.parse(JSON.stringify(this.searchLabel))
+      temp.pageSize = -1
       this.$set(
         temp,
-        "language",
-        localStorage.getItem("nz-language")
-          ? localStorage.getItem("nz-language")
-          : "en"
-      );
-      this.exportExcel(temp);
-      this.closeDialog();
+        'language',
+        localStorage.getItem('nz-language')
+          ? localStorage.getItem('nz-language')
+          : 'en'
+      )
+      this.exportExcel(temp)
+      this.closeDialog()
     },
-    closeDialog() {
-      this.importBox.show = false;
-      this.deleteBox.show = false;
+    closeDialog () {
+      this.importBox.show = false
+      this.deleteBox.show = false
     },
-    getTableData(params) {
+    getTableData (params) {
       if (params && Object.keys(params).length > 0) {
         for (const key in params) {
-          this.$set(this.searchLabel, key, params[key]);
+          this.$set(this.searchLabel, key, params[key])
         }
       }
       if (this.orderBy) {
-        this.$set(this.searchLabel, "orderBy", this.orderBy);
+        this.$set(this.searchLabel, 'orderBy', this.orderBy)
       } else {
-        delete this.searchLabel.orderBy;
+        delete this.searchLabel.orderBy
       }
-      this.$set(this.searchLabel, "pageNo", this.pageObj.pageNo);
-      this.$set(this.searchLabel, "pageSize", this.pageObj.pageSize);
-      this.tools.loading = true;
+      this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo)
+      this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize)
+      this.tools.loading = true
       const alertRuleParam = {
         ...this.searchLabel,
-        ...this.searchCheckBox,
-      };
-      const path = this.fromRoute.alertSilence;
-      this.updatePath(alertRuleParam, path);
+        ...this.searchCheckBox
+      }
+      const path = this.fromRoute.alertSilence
+      this.updatePath(alertRuleParam, path)
       this.$get(this.url, { ...this.searchLabel, ...this.searchCheckBox }).then(
         (response) => {
-          this.tools.loading = false;
-          this.nowTime = this.utcTimeToTimezoneStr(response.time);
+          this.tools.loading = false
+          this.nowTime = this.utcTimeToTimezoneStr(response.time)
           if (response.code === 200) {
             for (let i = 0; i < response.data.list.length; i++) {
-              response.data.list[i].status = response.data.list[i].status + "";
+              response.data.list[i].status = response.data.list[i].status + ''
               // response.data.list[i].startAt = bus.UTCTimeToConfigTimezone(response.data.list[i].startAt)
               // response.data.list[i].endAt = bus.UTCTimeToConfigTimezone(response.data.list[i].endAt)
             }
-            this.tableData = response.data.list;
-            this.pageObj.total = response.data.total;
+            this.tableData = response.data.list
+            this.pageObj.total = response.data.total
             if (
               !this.scrollbarWrap &&
               this.$refs.dataTable &&
@@ -263,111 +269,126 @@ export default {
             ) {
               this.$nextTick(() => {
                 this.scrollbarWrap =
-                  this.$refs.dataTable.$refs.dataTable.bodyWrapper;
-                this.toTopBtnHandler(this.scrollbarWrap);
-              });
+                  this.$refs.dataTable.$refs.dataTable.bodyWrapper
+                this.toTopBtnHandler(this.scrollbarWrap)
+              })
             }
           }
         }
-      );
+      )
     },
-    add() {
-      this.blankObject.startAt = bus.getOffsetTimezoneData();
-      this.blankObject.endAt = bus.getOffsetTimezoneData(1);
-      this.object = JSON.parse(JSON.stringify(this.blankObject));
-      this.rightBox.show = true;
+    add () {
+      this.blankObject.startAt = bus.getOffsetTimezoneData()
+      this.blankObject.endAt = bus.getOffsetTimezoneData(1)
+      this.object = JSON.parse(JSON.stringify(this.blankObject))
+      this.rightBox.show = true
     },
-    edit(u, copyFlag) {
+    edit (u, copyFlag) {
       this.$get(`${this.url}/${u.id}`).then((response) => {
         if (response.code === 200) {
           this.object = {
             ...response.data,
             matchers: JSON.parse(response.data.matchers),
             startAt: bus.UTCTimeToConfigTimezone(response.data.startAt),
-            endAt: bus.UTCTimeToConfigTimezone(response.data.endAt),
-          };
+            endAt: bus.UTCTimeToConfigTimezone(response.data.endAt)
+          }
           if (copyFlag) {
-            this.object.id = "";
-            this.object.name = this.object.name + "-copy";
+            this.object.id = ''
+            this.object.name = this.object.name + '-copy'
             if (this.object.name.length > 64) {
-              const length = this.object.name.length - 64;
+              const length = this.object.name.length - 64
               this.object.name =
-                u.name.substring(0, u.name.length - length) + "-copy";
+                u.name.substring(0, u.name.length - length) + '-copy'
             }
           }
-          this.rightBox.show = true;
+          this.rightBox.show = true
         }
-      });
+      })
     },
-    copy(u) {
-      this.edit(u, true);
+    copy (u) {
+      this.edit(u, true)
     },
-    del(row) {
-      this.$confirm(this.$t("tip.confirmExpired"), {
-        confirmButtonText: this.$t("tip.yes"),
-        cancelButtonText: this.$t("tip.no"),
-        type: "warning",
+    del (row) {
+      this.$confirm(this.$t('tip.confirmExpired'), {
+        confirmButtonText: this.$t('tip.yes'),
+        cancelButtonText: this.$t('tip.no'),
+        type: 'warning'
       }).then(() => {
-        this.$delete(this.url + "?ids=" + row.id + "&state=" + this.state).then(
+        this.$delete(this.url + '?ids=' + row.id + '&state=' + this.state).then(
           (response) => {
             if (response.code === 200) {
-              this.delFlag = true;
+              this.delFlag = true
               this.$message({
                 duration: 2000,
-                type: "success",
-                message: this.$t("tip.deleteSuccess"),
-              });
-              this.getTableData();
+                type: 'success',
+                message: this.$t('tip.deleteSuccess')
+              })
+              this.getTableData()
             } else {
-              this.$message.error(response.msg);
+              this.$message.error(response.msg)
             }
           }
-        );
-      });
-    },
+        )
+      })
+    }
   },
-  created() {
+  created () {
     const searchKeys = {
       // key: path 键
       // value: vue set 参数
-      pageNo: { target: this.pageObj, propertyName: "pageNo", type: "number" },
+      pageNo: { target: this.pageObj, propertyName: 'pageNo', type: 'number' },
       pageSize: {
         target: this.pageObj,
-        propertyName: "pageSize",
-        type: "number",
+        propertyName: 'pageSize',
+        type: 'number'
       },
-      orderBy: { target: this.$data, propertyName: "orderBy", type: "string" },
+      orderBy: { target: this.$data, propertyName: 'orderBy', type: 'string' },
       ids: {
         target: this.searchLabel,
         isSearchInput: true,
-        propertyName: "ids",
-        type: "string",
+        propertyName: 'ids',
+        type: 'string',
         defaultJson: {
           disabled: false,
-          id: "ids",
-          label: "ids",
-          name: "ID",
-          type: "input",
-          val: "",
+          id: 'ids',
+          label: 'ids',
+          name: 'ID',
+          type: 'input',
+          val: ''
         },
-        jsonKey: "val",
+        jsonKey: 'val'
       },
       matchers: {
         target: this.searchLabel,
         isSearchInput: true,
-        propertyName: "matchers",
-        type: "string",
+        propertyName: 'matchers',
+        type: 'string',
         defaultJson: {
           disabled: false,
-          label: "matchers",
-          name: "Matcher",
-          type: "input",
-          val: "",
+          label: 'matchers',
+          name: 'Matcher',
+          type: 'input',
+          val: ''
         },
-        jsonKey: "val",
+        jsonKey: 'val'
       },
-    };
-    this.initQueryFromPath(searchKeys);
-  },
-};
+      state: {
+        target: this.searchLabel,
+        isSearchInput: true,
+        propertyName: 'state',
+        type: 'number',
+        defaultJson: {
+          name: 'state',
+          type: 'select',
+          label: 'silenceState',
+          disabled: false,
+          val: '',
+          listStr: 'silenceState'
+        },
+        jsonKey: 'valnum',
+      }
+    }
+    this.initQueryFromPath(searchKeys)
+  }
+}
 </script>

From 682f01bb805c5249ed016829f772fc4de6f67fa1 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 7 Sep 2022 10:03:52 +0800
Subject: [PATCH 22/37] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E8=AE=B0=E5=BD=95=E6=97=A0=E6=B3=95=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7a6b18d71..e51b98eb9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,32 +30,32 @@ dev_build:
   # 所需执行的脚本
   script:
     - env | sort
-    - pwd 
+    - pwd
     - cd nezha-fronted
 
     # 安装 npm 依赖文件
     - echo "npm install ..."
     - npm install --registry=http://registry.npmmirror.com
     - echo "npm run build"
-    
+
     # 编译 上传模板
     - npm run build:html
     - mc alias set nz $MINIO_HOST $MINIO_USER $MINIO_PWD
     - mc cp dist/index.html nz/depends/template/snapshot_template.html
 
     - npm run build
-    - cd /builds/nezha/nezha-fronted/nezha-fronted/dist 
+    - cd /builds/nezha/nezha-fronted/nezha-fronted/dist
     - mc cp nz/depends/template/snapshot_template.html ./snapshot_template.html
     - rm -rf nz-gui*.zip
     - export FILE_NAME=nz-gui-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA.zip
     # 生成 git log 日志文件
-    - sed -i 's+</body>+<a style="position:fixed;bottom:20px;left:40px;z-index:999;color:white;" target="_blank" href="./static/git-log.html">更新记录</a>\n</body>+g' ./index.html;
-    - echo "<pre>" > ./static/git-log.html
+    - sed -i 's+</body>+<a style="position:fixed;bottom:20px;left:40px;z-index:999;color:white;" target="_blank" href="/static/git-log.html">更新记录</a>\n</body>+g' ./index.html;
+    - echo "<pre>" > /static/git-log.html
     - "git log -100 --pretty=format:'%ad : %s' >> ./static/git-log.html"
-    - echo "</pre>" >> ./static/git-log.html
+    - echo "</pre>" >> /static/git-log.html
     - zip -q -r $FILE_NAME ./*
 
-    # 将 dist zip 上传到 minio 
+    # 将 dist zip 上传到 minio
     - mc cp $FILE_NAME nz/ci-cd/nz-gui/$FILE_NAME
     - mc cp $FILE_NAME nz/ci-cd/nz-gui/nz-gui-$CI_COMMIT_REF_NAME-latest.zip
   artifacts:
@@ -78,7 +78,7 @@ rel_build:
   # 所需执行的脚本
   script:
     - env | sort
-    - pwd 
+    - pwd
     - echo "npm install ..."
     - cd nezha-fronted
     - npm install --registry=http://registry.npmmirror.com

From 0aa908d8669ae86b0f5977a92831318fcb3d6aff Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 7 Sep 2022 10:19:50 +0800
Subject: [PATCH 23/37] =?UTF-8?q?fix=EF=BC=9A=E7=A6=81=E7=94=A8=20issueTab?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml                                              | 4 ++--
 nezha-fronted/src/components/common/bottomBox/bottomBox.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e51b98eb9..de1f219c1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,9 +50,9 @@ dev_build:
     - export FILE_NAME=nz-gui-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA.zip
     # 生成 git log 日志文件
     - sed -i 's+</body>+<a style="position:fixed;bottom:20px;left:40px;z-index:999;color:white;" target="_blank" href="/static/git-log.html">更新记录</a>\n</body>+g' ./index.html;
-    - echo "<pre>" > /static/git-log.html
+    - echo "<pre>" > ./static/git-log.html
     - "git log -100 --pretty=format:'%ad : %s' >> ./static/git-log.html"
-    - echo "</pre>" >> /static/git-log.html
+    - echo "</pre>" >> ./static/git-log.html
     - zip -q -r $FILE_NAME ./*
 
     # 将 dist zip 上传到 minio
diff --git a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
index 5a506fadb..cb41a0457 100644
--- a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
+++ b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
@@ -67,7 +67,7 @@
         <!--alertRule Tab-->
         <alertMessageTabNew v-if="from === fromRoute.alertSilence && targetTab === 'alertMessageTab'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="tabs.alertSilence" @changeTab="changeTab" :targetTab.sync="targetTab"></alertMessageTabNew>
         <!--issue Tab-->
-        <issueTab v-if="from === fromRoute.issue && targetTab === 'issue'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="tabs.alertSilence" @changeTab="changeTab" :targetTab.sync="targetTab"></issueTab>
+<!--        <issueTab v-if="from === fromRoute.issue && targetTab === 'issue'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="tabs.alertSilence" @changeTab="changeTab" :targetTab.sync="targetTab"></issueTab>-->
       </div>
     </div>
   </div>
@@ -274,7 +274,7 @@ export default {
           { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: true }
         ],
         issue: [
-          { prop: 'issue', name: this.$t('overall.issue'), active: true }
+          // { prop: 'issue', name: this.$t('overall.issue'), active: true }
         ]
       }
     }

From 183ee13d4055c203f2913c30a6f472afae98a8d1 Mon Sep 17 00:00:00 2001
From: zhangshuai <zhangshuai@geedgenetworks.com>
Date: Wed, 7 Sep 2022 10:55:53 +0800
Subject: [PATCH 24/37] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dgit=20=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E4=B8=AD=E6=96=87=E4=B9=B1=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index de1f219c1..1fa629083 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,9 +50,13 @@ dev_build:
     - export FILE_NAME=nz-gui-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA.zip
     # 生成 git log 日志文件
     - sed -i 's+</body>+<a style="position:fixed;bottom:20px;left:40px;z-index:999;color:white;" target="_blank" href="/static/git-log.html">更新记录</a>\n</body>+g' ./index.html;
-    - echo "<pre>" > ./static/git-log.html
+    - echo "<html>" > ./static/git-log.html
+    - echo "<head>" >> ./static/git-log.html
+    - echo "<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">" >> ./static/git-log.html
+    - echo "</head>" >> ./static/git-log.html
+    - echo "<pre>" >> ./static/git-log.html
     - "git log -100 --pretty=format:'%ad : %s' >> ./static/git-log.html"
-    - echo "</pre>" >> ./static/git-log.html
+    - echo "</pre></html>" >> ./static/git-log.html
     - zip -q -r $FILE_NAME ./*
 
     # 将 dist zip 上传到 minio

From a4cca4efe2f4f25f650ba6066e814ee9bd5cecbf Mon Sep 17 00:00:00 2001
From: zhangshuai <zhangshuai@geedgenetworks.com>
Date: Wed, 7 Sep 2022 11:07:50 +0800
Subject: [PATCH 25/37] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dgit=20=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E4=B8=AD=E6=96=87=E4=B9=B1=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1fa629083..7e72071f0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,7 +52,7 @@ dev_build:
     - sed -i 's+</body>+<a style="position:fixed;bottom:20px;left:40px;z-index:999;color:white;" target="_blank" href="/static/git-log.html">更新记录</a>\n</body>+g' ./index.html;
     - echo "<html>" > ./static/git-log.html
     - echo "<head>" >> ./static/git-log.html
-    - echo "<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">" >> ./static/git-log.html
+    - echo '<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">' >> ./static/git-log.html
     - echo "</head>" >> ./static/git-log.html
     - echo "<pre>" >> ./static/git-log.html
     - "git log -100 --pretty=format:'%ad : %s' >> ./static/git-log.html"

From c88ccc44303803b0ad3f13f6e4444d959c41713f Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 7 Sep 2022 11:29:55 +0800
Subject: [PATCH 26/37] =?UTF-8?q?NEZ-2179=20fix=EF=BC=9Aquick=20silence=20?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=20nz=5Fagent=5Fid=20=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/mixin/dataList.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/mixin/dataList.js b/nezha-fronted/src/components/common/mixin/dataList.js
index 450a21f60..f6df9565e 100644
--- a/nezha-fronted/src/components/common/mixin/dataList.js
+++ b/nezha-fronted/src/components/common/mixin/dataList.js
@@ -303,7 +303,7 @@ export default {
         let labels = this.$loadsh.cloneDeep(row.labels)
         if (typeof labels === 'string') labels = JSON.parse(labels)
         this.objectSilence.matchers = []
-        const filterArr = ['alertname', 'severity_id', 'severity', 'rule_type']
+        const filterArr = ['alertname', 'severity_id', 'severity', 'rule_type', 'nz_agent_id']
         Object.keys(labels).forEach((key, i) => {
           if (filterArr.indexOf(key) != -1) {
             return

From 3c7ee3c1b0d8d948693b1f73ff626e2b835af059 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 7 Sep 2022 11:54:34 +0800
Subject: [PATCH 27/37] =?UTF-8?q?NEZ-2179=20fix=EF=BC=9Aquick=20silence=20?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=20nz=5Fagent=5Fid=20=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/mixin/dataList.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/mixin/dataList.js b/nezha-fronted/src/components/common/mixin/dataList.js
index e13550b2d..b9012efdb 100644
--- a/nezha-fronted/src/components/common/mixin/dataList.js
+++ b/nezha-fronted/src/components/common/mixin/dataList.js
@@ -292,7 +292,7 @@ export default {
         let labels = this.$loadsh.cloneDeep(row.labels)
         if (typeof labels === 'string') labels = JSON.parse(labels)
         this.objectSilence.matchers = []
-        const filterArr = ['alertname', 'severity_id', 'severity', 'rule_type']
+        const filterArr = ['alertname', 'severity_id', 'severity', 'rule_type', 'nz_agent_id']
         Object.keys(labels).forEach((key, i) => {
           if (filterArr.indexOf(key) != -1) {
             return

From 4766d70a4cc98e1009543dfc259bb518ad8562f0 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 7 Sep 2022 14:07:13 +0800
Subject: [PATCH 28/37] =?UTF-8?q?NEZ-2182=20fix=EF=BC=9Aproject=20topology?=
 =?UTF-8?q?=20=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/ChartDiagram/diagram.vue  | 13 +++++++++++--
 .../src/components/common/project/topologyL5.vue    | 12 +++++++++---
 .../components/common/table/settings/agentTable.vue |  2 +-
 .../components/common/table/settings/userTable.vue  |  4 ++--
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
index 029921e26..1e6d88544 100644
--- a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
+++ b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
@@ -698,6 +698,9 @@ export default {
       if (this.fromTopologyDialog && !this.isPreview) {
         setTimeout(() => {
           this.topologyLoading = false
+          if (!data.pens) {
+            data.pens = []
+          }
           getTopology(this.topologyIndex).open(data || {})
           getTopology(this.topologyIndex).centerView()
           getTopology(this.topologyIndex).resize()
@@ -708,6 +711,9 @@ export default {
           if (!getTopology(this.topologyIndex)) {
             return
           }
+          if (!data.pens) {
+            data.pens = []
+          }
           getTopology(this.topologyIndex).open(data || {})
           getTopology(this.topologyIndex).lock(1)
           this.objChange = false
@@ -1213,7 +1219,7 @@ export default {
     },
 
     onUpdateProps (node) {
-      let obj = this.$loadsh.cloneDeep(node)
+      const obj = this.$loadsh.cloneDeep(node)
       delete obj.x
       delete obj.y
       delete obj.center
@@ -1762,7 +1768,10 @@ export default {
         const domRect = dom ? dom.getBoundingClientRect() : {}
         getTopology(this.topologyIndex).canvasPos = domRect
         if (this.fromOverView) {
-          getTopology(this.topologyIndex).open(this.oldTopologyData  || {})
+          if (this.oldTopologyData && !this.oldTopologyData.pens) {
+            this.oldTopologyData.pens = []
+          }
+          getTopology(this.topologyIndex).open(this.oldTopologyData || {})
         }
         let flag = false
         const position = {
diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue
index 5d4e3d857..65b611c67 100644
--- a/nezha-fronted/src/components/common/project/topologyL5.vue
+++ b/nezha-fronted/src/components/common/project/topologyL5.vue
@@ -713,7 +713,10 @@ export default {
         if (!getTopology(this.topologyIndex)) {
           return
         }
-        getTopology(this.topologyIndex).open(data || {})
+        if (!data.pens) {
+          data.pens = []
+        }
+        getTopology(this.topologyIndex).open(data)
         getTopology(this.topologyIndex).lock(1)
         this.objChange = false
         let flag = false
@@ -1646,7 +1649,7 @@ export default {
     },
 
     onUpdateProps (node) { // 更新pen
-      let obj = this.$loadsh.cloneDeep(node)
+      const obj = this.$loadsh.cloneDeep(node)
       console.log(obj)
       delete obj.x
       delete obj.y
@@ -2231,7 +2234,10 @@ export default {
         let domRect = document.getElementById('topology-canvas' + this.topologyIndex).getBoundingClientRect()
         getTopology(this.topologyIndex).canvasPos = domRect
         if (this.fromOverView) {
-          getTopology(this.topologyIndex).open(this.oldTopologyData || {})
+          if (this.oldTopologyData && !this.oldTopologyData.pens) {
+            this.oldTopologyData.pens = []
+          }
+          getTopology(this.topologyIndex).open(this.oldTopologyData)
         }
         let flag = false
 
diff --git a/nezha-fronted/src/components/common/table/settings/agentTable.vue b/nezha-fronted/src/components/common/table/settings/agentTable.vue
index fa973f5d9..b20044a36 100644
--- a/nezha-fronted/src/components/common/table/settings/agentTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/agentTable.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="height: 100%">
   <el-table
     id="roleTable"
     ref="dataTable"
diff --git a/nezha-fronted/src/components/common/table/settings/userTable.vue b/nezha-fronted/src/components/common/table/settings/userTable.vue
index e7538995a..4500b1fc6 100644
--- a/nezha-fronted/src/components/common/table/settings/userTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/userTable.vue
@@ -1,5 +1,5 @@
 <template>
-<div height="100%">
+<div style="height: 100%">
   <el-table
     id="userTable"
     ref="dataTable"
@@ -118,7 +118,7 @@
       <div v-else>&nbsp;</div>
     </template>
   </el-table>
-  </div>
+</div>
 </template>
 
 <script>

From 889ddca357e6bc24bddf354349bd40f7d33f4c5d Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 7 Sep 2022 15:45:51 +0800
Subject: [PATCH 29/37] =?UTF-8?q?NEZ-2180=20fix=EF=BC=9Aasset=20=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E8=A7=86=E5=9B=BE=20hover=E5=BC=B9=E7=AA=97=20?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=81=AE=E6=8C=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/alert/alertLabel.vue       |  2 +-
 .../src/components/common/alert/alertLabel3.vue      | 12 ++++++------
 .../src/components/common/alert/alertRuleInfo.vue    |  2 +-
 .../src/components/common/alert/alertRuleInfo2.vue   |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/nezha-fronted/src/components/common/alert/alertLabel.vue b/nezha-fronted/src/components/common/alert/alertLabel.vue
index 1b56c5aab..50a8a4521 100644
--- a/nezha-fronted/src/components/common/alert/alertLabel.vue
+++ b/nezha-fronted/src/components/common/alert/alertLabel.vue
@@ -70,7 +70,7 @@
               : "--"
           }}
         </div>
-        <i v-if="alertLabelData.manageIp" class="nz-icon nz-icon-override asset-manage-ip" style="visibility: hidden" @click="onCopy(alertLabelData.manageIp)" :title="$t('overall.copyText')"></i>
+        <i v-if="alertLabelData && alertLabelData.manageIp" class="nz-icon nz-icon-override asset-manage-ip" style="visibility: hidden" @click="onCopy(alertLabelData.manageIp)" :title="$t('overall.copyText')"></i>
       </div>
       <div class="alert-label-box">
         <div class="alert-label-title">{{ $t("overall.type") }}</div>
diff --git a/nezha-fronted/src/components/common/alert/alertLabel3.vue b/nezha-fronted/src/components/common/alert/alertLabel3.vue
index 38054ac00..497366e3b 100644
--- a/nezha-fronted/src/components/common/alert/alertLabel3.vue
+++ b/nezha-fronted/src/components/common/alert/alertLabel3.vue
@@ -31,7 +31,7 @@
         <div class="document-copy-block">
           <div class="alert-label-title">{{$t('overall.name')}}</div>
           <div class="alert-label-value document-copy-text">{{alertLabelData && alertLabelData.name ? alertLabelData.name : '--'}}</div>
-          <i v-if="alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertLabelData.name)" :title="$t('overall.copyText')"></i>
+          <i v-if="alertLabelData && alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertLabelData.name)" :title="$t('overall.copyText')"></i>
          </div>
       </div>
        <!-- <div class="alert-label-box name-labe">
@@ -49,7 +49,7 @@
               : "--"
           }}
         </div>
-        <i v-if="alertLabelData.manageIp" class="nz-icon nz-icon-override asset-manage-ip" style="visibility: hidden" @click="onCopy(alertLabelData.manageIp)" :title="$t('overall.copyText')"></i>
+        <i v-if="alertLabelData && alertLabelData.manageIp" class="nz-icon nz-icon-override asset-manage-ip" style="visibility: hidden" @click="onCopy(alertLabelData.manageIp)" :title="$t('overall.copyText')"></i>
       </div>
       <div class="alert-label-box">
         <div class="alert-label-title">{{ $t("overall.type") }}</div>
@@ -197,7 +197,7 @@
            <div class="alert-label-value document-copy-text">
              {{ alertLabelData && alertLabelData.name ? alertLabelData.name : "--" }}
            </div>
-           <i v-if="alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertLabelData.name)" :title="$t('overall.copyText')"></i>
+           <i v-if="alertLabelData && alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertLabelData.name)" :title="$t('overall.copyText')"></i>
          </div>
       </div>
       <div class="alert-label-box">
@@ -293,7 +293,7 @@
            <div class="alert-label-value document-copy-text">
              {{ alertLabelData && alertLabelData.name ? alertLabelData.name : "--" }}
            </div>
-           <i v-if="alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertLabelData.name)" :title="$t('overall.copyText')"></i>
+           <i v-if="alertLabelData && alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertLabelData.name)" :title="$t('overall.copyText')"></i>
          </div>
       </div>
       <div class="alert-label-box">
@@ -391,7 +391,7 @@
             <div class="alert-label-value document-copy-text">
               {{ alertLabelData && alertLabelData.name ? alertLabelData.name : "--" }}
             </div>
-           <i v-if="alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertLabelData.name)" :title="$t('overall.copyText')"></i>
+           <i v-if="alertLabelData && alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertLabelData.name)" :title="$t('overall.copyText')"></i>
          </div>
       </div>
       <div class="alert-label-box">
@@ -526,7 +526,7 @@
            <div class="alert-label-value  document-copy-text">
               {{ alertLabelData && alertLabelData.name ? alertLabelData.name : "--" }}
           </div>
-           <i v-if="alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertLabelData.name)" :title="$t('overall.copyText')"></i>
+           <i v-if="alertLabelData && alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertLabelData.name)" :title="$t('overall.copyText')"></i>
          </div>
       </div>
       <div class="alert-label-box">
diff --git a/nezha-fronted/src/components/common/alert/alertRuleInfo.vue b/nezha-fronted/src/components/common/alert/alertRuleInfo.vue
index bb5d204d0..3faec45be 100644
--- a/nezha-fronted/src/components/common/alert/alertRuleInfo.vue
+++ b/nezha-fronted/src/components/common/alert/alertRuleInfo.vue
@@ -19,7 +19,7 @@
           <div class="document-copy-block">
            <div class="alert-label-title">{{$t('overall.name')}}</div>
           <div class="alert-label-value document-copy-text">{{alertRuleData.name ? alertRuleData.name : '--'}}</div>
-           <i v-if="alertRuleData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertRuleData.name)" :title="$t('overall.copyText')"></i>
+           <i v-if="alertRuleData && alertRuleData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertRuleData.name)" :title="$t('overall.copyText')"></i>
          </div>
 
         </div>
diff --git a/nezha-fronted/src/components/common/alert/alertRuleInfo2.vue b/nezha-fronted/src/components/common/alert/alertRuleInfo2.vue
index 37c1757e1..bdada006c 100644
--- a/nezha-fronted/src/components/common/alert/alertRuleInfo2.vue
+++ b/nezha-fronted/src/components/common/alert/alertRuleInfo2.vue
@@ -17,7 +17,7 @@
          <div class="document-copy-block" style="display:flex">
           <div class="alert-label-title">{{$t('overall.name')}}</div>
           <div class="alert-label-value document-copy-text">{{alertRuleData.name ? alertRuleData.name : '--'}}</div>
-          <i v-if="alertRuleData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertRuleData.name)" :title="$t('overall.copyText')"></i>
+          <i v-if="alertRuleData && alertRuleData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertRuleData.name)" :title="$t('overall.copyText')"></i>
          </div>
       </div>
 <!--      <div class="alert-label-box">-->

From ef1f36de7ba0471331ef7405e0a3a3ea3053cb16 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Thu, 8 Sep 2022 09:56:36 +0800
Subject: [PATCH 30/37] =?UTF-8?q?fix=20:=20explore=20log=20=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../css/components/page/dashboard/explore/explore.scss      | 4 ++++
 .../src/components/page/dashboard/explore/exploreItem.vue   | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/assets/css/components/page/dashboard/explore/explore.scss b/nezha-fronted/src/assets/css/components/page/dashboard/explore/explore.scss
index 3d0ef869d..37f6ed914 100644
--- a/nezha-fronted/src/assets/css/components/page/dashboard/explore/explore.scss
+++ b/nezha-fronted/src/assets/css/components/page/dashboard/explore/explore.scss
@@ -414,6 +414,10 @@ article {
     .box-overflow{
       overflow-x: scroll;
     }
+    pre.box-overflow{
+      overflow-x: scroll;
+      padding-bottom: 0;
+    }
     .logfmt-module,.json-module,.pattern-module,.regular-module,.unpack-module,.line-module,.formatting-module,.unwrapped-module{
       pre {
         border: 0;
diff --git a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
index d65b6fd97..ccc9d452a 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
@@ -286,7 +286,7 @@ instance_cpu_time_ns{app="fox", proc="widget", rev="4d3a513", env="prod", job="c
                 <h1 class="page-header" style="margin-Top:0px" id="log-query-language">LogQL: Log query language<a class="header-anchor" href="https://grafana.com/docs/loki/latest/logql/" rel="noopener noreferrer" target="_blank"><i class="nz-icon nz-icon-link1" style="font-size: 16px;" :title="$t('overall.link')"></i></a></h1>
                 <div class="title-heard__divider"></div>
                 <div class="page-header-label">
-                    <p>LogQL is Grafana Loki’s PromQL-inspired query language. Queries act as if they are a distributed grep to aggregate log sources. LogQL uses labels and operators for filtering.</p>
+                    <p style="width:calc(100% - 380px);">LogQL is Grafana Loki’s PromQL-inspired query language. Queries act as if they are a distributed grep to aggregate log sources. LogQL uses labels and operators for filtering.</p>
                     <p>There are two types of LogQL queries:</p>
                     <ul>
                      <li><b style="color: #3C92F1" @click="jumpClick('#log-queries')" class="log-link">Log queries </b>return the contents of log lines.</li>
@@ -308,7 +308,7 @@ instance_cpu_time_ns{app="fox", proc="widget", rev="4d3a513", env="prod", job="c
                     <li>a log stream selector <code>{container="query-frontend",namespace="loki-dev"}</code> which targets the <code>query-frontend</code> container in the <code>loki-dev</code> namespace.</li>
                     <li>a log pipeline <code>|= "metrics.go" | logfmt | duration > 10s and throughput_mb < 500</code> which will filter out log that contains the word <code>metrics.go</code>, then parses each log line to extract more labels and filter with them.</li>
                   </ul>
-                  <pre>To avoid escaping special characters you can use the <code>`</code>(backtick) instead of<code> " </code>when quoting strings. For example <code>`\w+`</code> is the same as <code>"\\w+"</code>. This is specially useful when writing a regular expression which contains multiple <br/>backslashes that require escaping.</pre>
+                  <pre class="box-overflow">To avoid escaping special characters you can use the <code>`</code>(backtick) instead of<code> " </code>when quoting strings. For example <code>`\w+`</code> is the same as <code>"\\w+"</code>. This is specially useful when writing a regular expression which contains multiple <br/>backslashes that require escaping.</pre>
                 </div>
                 <!-- Log stream selector -->
                 <div class="introduce-view__content">
@@ -642,7 +642,7 @@ instance_cpu_time_ns{app="fox", proc="widget", rev="4d3a513", env="prod", job="c
                  <p>The right side can alternatively be a template string (double quoted or backtick), for example dst="<code v-pre>{{.status}} {{.query}}</code>", in which case the <code>dst</code> label value is replaced by the result of the text/template evaluation. This is the same template engine as the <code>| line_format</code> expression, which means labels are available as variables and you can use the same list of functions.</p>
                  <p>In both cases, if the destination label doesn’t exist, then a new one is created.</p>
                  <p>The renaming form <code>dst=src</code> will drop the <code>src</code> label after remapping it to the <code>dst</code> label. However, the template form will preserve the referenced labels, such that <code v-pre>dst="{{.src}}"</code> results in both <code>dst</code> and <code>src</code> having the same value.</p>
-                 <pre>A single label name can only appear once per expression. This means <code>| label_format foo=bar,foo="new"</code> is not allowed but you can use two expressions for the desired effect: <code>| label_format foo=bar | label_format foo="new"</code></pre>
+                 <pre class="box-overflow">A single label name can only appear once per expression. This means <code>| label_format foo=bar,foo="new"</code> is not allowed but you can use two expressions for the desired effect: <code>| label_format foo=bar | label_format foo="new"</code></pre>
                 </div>
               </div>
               <!-- Log queries examples -->

From a3cf8e1f9082d670279833596906ef8c25962abb Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 8 Sep 2022 10:16:19 +0800
Subject: [PATCH 31/37] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=20topology=20?=
 =?UTF-8?q?=E7=B7=A8=E8=BC=AF=E6=99=82=20metrics=20=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=AF=AD=E5=8F=A5=E4=B8=AD=E9=97=B4=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/project/L5/CanvasProps.vue         | 82 +++++++++----------
 .../page/dashboard/explore/promqlInput.vue    |  9 +-
 2 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
index 0ccad75a8..e1d3f0f63 100644
--- a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
+++ b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
@@ -1,8 +1,7 @@
 <template>
   <div class="props-box" :loading="loading">
     <!--所有属性-->
-    <keep-alive>
-      <el-tabs v-model="tab" type="card" v-if="selection.pen" @tab-click="tabClick">
+    <el-tabs v-model="tab" type="card" v-if="selection.pen" @tab-click="tabClick">
       <el-tab-pane :label="$t('project.topology.data')" name="1">
         <el-form v-model="selection.pen.data" class="pens-data" label-position="top">
           <!--module-->
@@ -24,11 +23,11 @@
           <el-row class="form-row-title">
             {{ $t('dashboard.panel.chartForm.thresholds') }}
             <span v-if="selection.pen.data.valueMappingSort !=='desc'" class="title__label"
-                  >（0:Ok > … >{{
+            >（0:Ok > … >{{
                 selection.pen.data.valueMapping.length
               }}:Critical）</span>
             <span v-if="selection.pen.data.valueMappingSort ==='desc'" class="title__label"
-                  >（{{
+            >（{{
                 selection.pen.data.valueMapping.length
               }}:Critical > … >0:Ok）</span>
             <el-form-item class="float-right" prop="type" style="height: 100%;">
@@ -45,6 +44,7 @@
               <el-row v-for="(item,index) in selection.pen.data.expressArr" :key="index" class="element-item form-row-item"
                       style="">
                 <promql-input
+                  v-if="selection.pen"
                   :from-father-data="true"
                   :isTopo="true"
                   :metricOptionsParent="metricOptions"
@@ -109,9 +109,9 @@
                       <span v-if="item.level!==0">
                         <div style="display: inline-block">
                           <nezhaColor :isTopo="true"
-                            :color-val="item.color"
-                            :presetColors="predefineColors" :single="false"
-                            :value-arr="[{name:'fill',value:item.color.fill,key:'bac'},{name:'line',value:item.color.line,key:'line'},{name:'text',value:item.color.text,key:'text'}]" @colorChange="(val,key)=>{colorChangeTable(item,val,key)}"/>
+                                      :color-val="item.color"
+                                      :presetColors="predefineColors" :single="false"
+                                      :value-arr="[{name:'fill',value:item.color.fill,key:'bac'},{name:'line',value:item.color.line,key:'line'},{name:'text',value:item.color.text,key:'text'}]" @colorChange="(val,key)=>{colorChangeTable(item,val,key)}"/>
                         </div>
                       </span>
                       <span v-else>base</span>
@@ -223,6 +223,7 @@
                       class="element-item form-row-item form-row-item-border"
                       style="width: 100%; border-radius: 2px; padding-right: 60px;">
                 <promql-input
+                  v-if="selection.pen"
                   :from-father-data="true"
                   :isTopo="true"
                   :metricOptionsParent="metricOptions"
@@ -716,53 +717,52 @@
                 </div>
               </div>
 
-<!--              <div class="props-pen-item">-->
-<!--                <div>{{ $t('project.topology.textOffsetX') }}</div>-->
-<!--                <div class="p10 pl0">-->
-<!--                  <el-input-number-->
-<!--                    @focus="inputFocus"-->
-<!--                    @blur="inputBlur"-->
-<!--                    :precision="0"-->
-<!--                    controls-position="right"-->
-<!--                    size="small" name="x"-->
-<!--                    class="input"-->
-<!--                    v-model.number="selection.pen.textLeft"-->
-<!--                    :readonly="readonly"-->
-<!--                    required-->
-<!--                    @change="onChange()"></el-input-number>-->
-<!--                </div>-->
-<!--              </div>-->
+              <!--              <div class="props-pen-item">-->
+              <!--                <div>{{ $t('project.topology.textOffsetX') }}</div>-->
+              <!--                <div class="p10 pl0">-->
+              <!--                  <el-input-number-->
+              <!--                    @focus="inputFocus"-->
+              <!--                    @blur="inputBlur"-->
+              <!--                    :precision="0"-->
+              <!--                    controls-position="right"-->
+              <!--                    size="small" name="x"-->
+              <!--                    class="input"-->
+              <!--                    v-model.number="selection.pen.textLeft"-->
+              <!--                    :readonly="readonly"-->
+              <!--                    required-->
+              <!--                    @change="onChange()"></el-input-number>-->
+              <!--                </div>-->
+              <!--              </div>-->
 
-<!--              <div class="props-pen-item">-->
-<!--                <div>{{ $t('project.topology.textOffsetY') }}</div>-->
-<!--                <div class="p10 pl0">-->
-<!--                  <el-input-number-->
-<!--                    @focus="inputFocus"-->
-<!--                    @blur="inputBlur"-->
-<!--                    :precision="0"-->
-<!--                    controls-position="right"-->
-<!--                    size="small" name="x"-->
-<!--                    class="input"-->
-<!--                    v-model.number="selection.pen.textTop"-->
-<!--                    :readonly="readonly"-->
-<!--                    required-->
-<!--                    @change="onChange()"></el-input-number>-->
-<!--                </div>-->
-<!--              </div>-->
+              <!--              <div class="props-pen-item">-->
+              <!--                <div>{{ $t('project.topology.textOffsetY') }}</div>-->
+              <!--                <div class="p10 pl0">-->
+              <!--                  <el-input-number-->
+              <!--                    @focus="inputFocus"-->
+              <!--                    @blur="inputBlur"-->
+              <!--                    :precision="0"-->
+              <!--                    controls-position="right"-->
+              <!--                    size="small" name="x"-->
+              <!--                    class="input"-->
+              <!--                    v-model.number="selection.pen.textTop"-->
+              <!--                    :readonly="readonly"-->
+              <!--                    required-->
+              <!--                    @change="onChange()"></el-input-number>-->
+              <!--                </div>-->
+              <!--              </div>-->
 
             </div>
           </el-collapse-item>
         </el-collapse>
       </el-tab-pane>
     </el-tabs>
-    </keep-alive>
     <!--选中多个-->
     <keep-alive>
       <div v-if="selection.pens" class="">
       <el-collapse v-model="activeNames">
         <!--对齐方式-->
         <el-collapse-item :title="$t('project.topology.align')" name="1" v-if="selection.pens">
-          <label class="hover pointer mr10 iconLabel" v-for="item in nodesAlign" :title="item.desc">
+          <label class="hover pointer mr10 iconLabel" v-for="item in nodesAlign" :title="item.desc" :key="item.value">
             <i :class="['iconfont','iconfontSize16',`icon-align-${item.value}`]"
                @click="onNodesAlign(item.value)"></i>
           </label>
diff --git a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
index c65ae05fa..8c831cde2 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
@@ -514,7 +514,8 @@ export default {
       projectOption: [],
       filterSilence: '',
       tempBoxId: {},
-      loading: false
+      loading: false,
+      firstInit: true
     }
   },
   computed: {
@@ -697,6 +698,9 @@ export default {
       }
     },
     newChange (val) {
+      if (this.firstInit && this.isTopo) {
+        return
+      }
       if (val) {
         this.oldcCodeLength = val.length
         this.codeMirrorValue[this.index] = val
@@ -1154,7 +1158,7 @@ export default {
       immediate: true,
       handler (n, o) {
         this.codeMirrorValue[this.index] = n[this.index]
-        if (this.isTopo) {
+        if (this.isTopo && this.firstInit) {
           setTimeout(() => {
             const text = this.newView.state.doc.toString()
             this.newView.dispatch(
@@ -1162,6 +1166,7 @@ export default {
                 changes: { from: 0, to: text.length, insert: this.codeMirrorValue[this.index] }
               })
             )
+            this.firstInit = false
           }, 200)
         }
       }

From 00b28d464d3f858e96f3ac58e83ac6532c1960bb Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 8 Sep 2022 13:47:46 +0800
Subject: [PATCH 32/37] =?UTF-8?q?fix=EF=BC=9A=E5=A4=84=E7=90=86=20asset=20?=
 =?UTF-8?q?=E5=A4=8D=E5=88=B6name=20=E8=AF=A6=E7=BB=86=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/alert/alertLabel.vue       | 12 ++++++------
 .../src/components/common/alert/alertLabel3.vue      | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/nezha-fronted/src/components/common/alert/alertLabel.vue b/nezha-fronted/src/components/common/alert/alertLabel.vue
index 50a8a4521..45cb6b807 100644
--- a/nezha-fronted/src/components/common/alert/alertLabel.vue
+++ b/nezha-fronted/src/components/common/alert/alertLabel.vue
@@ -52,7 +52,7 @@
         <div class="document-copy-block">
           <div class="alert-label-title">{{$t('overall.name')}}</div>
           <div class="alert-label-value document-copy-text">{{alertLabelData && alertLabelData.name ? alertLabelData.name : '--'}}</div>
-          <i v-if="alertLabelData && alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertLabelData.name)" :title="$t('overall.copyText')"></i>
+          <i v-if="alertLabelData && alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy.stop(alertLabelData.name)" :title="$t('overall.copyText')"></i>
          </div>
       </div>
        <!-- <div class="alert-label-box name-labe">
@@ -70,7 +70,7 @@
               : "--"
           }}
         </div>
-        <i v-if="alertLabelData && alertLabelData.manageIp" class="nz-icon nz-icon-override asset-manage-ip" style="visibility: hidden" @click="onCopy(alertLabelData.manageIp)" :title="$t('overall.copyText')"></i>
+        <i v-if="alertLabelData && alertLabelData.manageIp" class="nz-icon nz-icon-override asset-manage-ip" style="visibility: hidden" @click="onCopy.stop(alertLabelData.manageIp)" :title="$t('overall.copyText')"></i>
       </div>
       <div class="alert-label-box">
         <div class="alert-label-title">{{ $t("overall.type") }}</div>
@@ -218,7 +218,7 @@
            <div class="alert-label-value document-copy-text">
              {{ alertLabelData && alertLabelData.name ? alertLabelData.name : "--" }}
            </div>
-           <i v-if="alertLabelData && alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertLabelData.name)" :title="$t('overall.copyText')"></i>
+           <i v-if="alertLabelData && alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy.stop(alertLabelData.name)" :title="$t('overall.copyText')"></i>
          </div>
       </div>
       <div class="alert-label-box">
@@ -314,7 +314,7 @@
            <div class="alert-label-value document-copy-text">
              {{ alertLabelData && alertLabelData.name ? alertLabelData.name : "--" }}
            </div>
-           <i v-if="alertLabelData && alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertLabelData.name)" :title="$t('overall.copyText')"></i>
+           <i v-if="alertLabelData && alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy.stop(alertLabelData.name)" :title="$t('overall.copyText')"></i>
          </div>
       </div>
       <div class="alert-label-box">
@@ -412,7 +412,7 @@
         <div class="alert-label-value document-copy-text">
           {{ alertLabelData && alertLabelData.name ? alertLabelData.name : "--" }}
         </div>
-          <i v-if="alertLabelData && alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertLabelData.name)" :title="$t('overall.copyText')"></i>
+          <i v-if="alertLabelData && alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy.stop(alertLabelData.name)" :title="$t('overall.copyText')"></i>
          </div>
       </div>
       <div class="alert-label-box">
@@ -547,7 +547,7 @@
            <div class="alert-label-value document-copy-text">
              {{ alertLabelData && alertLabelData.name ? alertLabelData.name : "--" }}
            </div>
-           <i v-if="alertLabelData && alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertLabelData.name)" :title="$t('overall.copyText')"></i>
+           <i v-if="alertLabelData && alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy.stop(alertLabelData.name)" :title="$t('overall.copyText')"></i>
          </div>
       </div>
       <div class="alert-label-box">
diff --git a/nezha-fronted/src/components/common/alert/alertLabel3.vue b/nezha-fronted/src/components/common/alert/alertLabel3.vue
index 497366e3b..7a9575b8f 100644
--- a/nezha-fronted/src/components/common/alert/alertLabel3.vue
+++ b/nezha-fronted/src/components/common/alert/alertLabel3.vue
@@ -31,7 +31,7 @@
         <div class="document-copy-block">
           <div class="alert-label-title">{{$t('overall.name')}}</div>
           <div class="alert-label-value document-copy-text">{{alertLabelData && alertLabelData.name ? alertLabelData.name : '--'}}</div>
-          <i v-if="alertLabelData && alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertLabelData.name)" :title="$t('overall.copyText')"></i>
+          <i v-if="alertLabelData && alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy.stop(alertLabelData.name)" :title="$t('overall.copyText')"></i>
          </div>
       </div>
        <!-- <div class="alert-label-box name-labe">
@@ -49,7 +49,7 @@
               : "--"
           }}
         </div>
-        <i v-if="alertLabelData && alertLabelData.manageIp" class="nz-icon nz-icon-override asset-manage-ip" style="visibility: hidden" @click="onCopy(alertLabelData.manageIp)" :title="$t('overall.copyText')"></i>
+        <i v-if="alertLabelData && alertLabelData.manageIp" class="nz-icon nz-icon-override asset-manage-ip" style="visibility: hidden" @click="onCopy.stop(alertLabelData.manageIp)" :title="$t('overall.copyText')"></i>
       </div>
       <div class="alert-label-box">
         <div class="alert-label-title">{{ $t("overall.type") }}</div>
@@ -197,7 +197,7 @@
            <div class="alert-label-value document-copy-text">
              {{ alertLabelData && alertLabelData.name ? alertLabelData.name : "--" }}
            </div>
-           <i v-if="alertLabelData && alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertLabelData.name)" :title="$t('overall.copyText')"></i>
+           <i v-if="alertLabelData && alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy.stop(alertLabelData.name)" :title="$t('overall.copyText')"></i>
          </div>
       </div>
       <div class="alert-label-box">
@@ -293,7 +293,7 @@
            <div class="alert-label-value document-copy-text">
              {{ alertLabelData && alertLabelData.name ? alertLabelData.name : "--" }}
            </div>
-           <i v-if="alertLabelData && alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertLabelData.name)" :title="$t('overall.copyText')"></i>
+           <i v-if="alertLabelData && alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy.stop(alertLabelData.name)" :title="$t('overall.copyText')"></i>
          </div>
       </div>
       <div class="alert-label-box">
@@ -391,7 +391,7 @@
             <div class="alert-label-value document-copy-text">
               {{ alertLabelData && alertLabelData.name ? alertLabelData.name : "--" }}
             </div>
-           <i v-if="alertLabelData && alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertLabelData.name)" :title="$t('overall.copyText')"></i>
+           <i v-if="alertLabelData && alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy.stop(alertLabelData.name)" :title="$t('overall.copyText')"></i>
          </div>
       </div>
       <div class="alert-label-box">
@@ -526,7 +526,7 @@
            <div class="alert-label-value  document-copy-text">
               {{ alertLabelData && alertLabelData.name ? alertLabelData.name : "--" }}
           </div>
-           <i v-if="alertLabelData && alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(alertLabelData.name)" :title="$t('overall.copyText')"></i>
+           <i v-if="alertLabelData && alertLabelData.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy.stop(alertLabelData.name)" :title="$t('overall.copyText')"></i>
          </div>
       </div>
       <div class="alert-label-box">

From 9d08f57c379f7e1780afab415c0259308f4e25ea Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Thu, 8 Sep 2022 15:10:10 +0800
Subject: [PATCH 33/37] =?UTF-8?q?NEZ-2177=20feat=20:=20asset=20process=20?=
 =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E9=A1=B5=E9=9D=A2=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/css/common.scss      |   8 +
 .../components/common/bottomBox/bottomBox.vue | 127 +++++++-----
 .../bottomBox/tabs/processBottomTab.vue       | 181 +++++++++++++++++
 .../common/mixin/routerPathParams.js          |   6 +-
 .../common/table/asset/assetProcessTable.vue  | 191 ++++++++++++++++++
 5 files changed, 460 insertions(+), 53 deletions(-)
 create mode 100644 nezha-fronted/src/components/common/bottomBox/tabs/processBottomTab.vue
 create mode 100644 nezha-fronted/src/components/common/table/asset/assetProcessTable.vue

diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss
index 09de77b31..a64d39daa 100644
--- a/nezha-fronted/src/assets/css/common.scss
+++ b/nezha-fronted/src/assets/css/common.scss
@@ -283,10 +283,18 @@ td .nz-icon-gear:before {
       border-color: $--border-color-light-hover;
     }
   }
+  #elementQuery{
+    border: 1px solid $--border-color-light;
+  }
   .el-input__inner:hover {
     border-color: $--border-color-light-hover;
   }
 }
+.query-input-active.el-input{
+  #elementQuery{
+    border: 1px solid $--border-color-light !important;
+  }
+}
 .sub-box.detail-view-sub-box {
   .top-tools.top-tools--sub {
     padding: 0 15px 0 0;
diff --git a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
index cb41a0457..893d8fa7a 100644
--- a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
+++ b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
@@ -37,11 +37,12 @@
         <operation-log-tab v-if="from === fromRoute.user && targetTab === 'operationLogTab'" :from="from" :obj="obj" :tabs="tabs.user.operationLog" @changeTab="changeTab" :targetTab.sync="targetTab"></operation-log-tab>
         <terminal-log-tab v-if="from === fromRoute.user && targetTab === 'terminalLogTab'" :from="from" :obj="obj" :tabs="tabs.user.terminalLog" @changeTab="changeTab" :targetTab.sync="targetTab"></terminal-log-tab>
         <!-- asset列表的3个 -->
-        <panel-tab-new @exit="closeSubList" @getTableData="getTableData" :paramsType="'asset'" v-if="from === fromRoute.asset && targetTab === 'panelTab'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="tabs.asset.panel" :targetTab.sync="targetTab" @changeTab="changeTab"></panel-tab-new>
-        <alertMessageTabNew v-if="from === fromRoute.asset && targetTab === 'alertMessageTab'" v-show="subResizeShow" :sign="sign+'alert'" :from="from" :obj="obj" :tabs="tabs.asset.alertMessage" :targetTab.sync="targetTab" @changeTab="changeTab" ></alertMessageTabNew>
-        <endpointTabNew v-if="from === fromRoute.asset && targetTab === 'endpointTab'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="tabs.asset.endpoint" :targetTab.sync="targetTab" @changeTab="changeTab"></endpointTabNew>
-        <log-bottom-tab v-if="from === fromRoute.asset && targetTab === 'log'" v-show="subResizeShow" :sign="sign+'log'" :from="from" :obj="obj" :tabs="tabs.asset.log" :targetTab.sync="targetTab" @changeTab="changeTab"></log-bottom-tab>
-        <assetSubTab v-if="from === fromRoute.asset && targetTab === 'assetSubTab' && obj.childrenNum" v-show="subResizeShow" :from="from" :obj="obj" :tabs="tabs.asset.alertMessageSub" @changeTab="changeTab" :targetTab.sync="targetTab"></assetSubTab>
+        <panel-tab-new @exit="closeSubList" @getTableData="getTableData" :paramsType="'asset'" v-if="from === fromRoute.asset && targetTab === 'panelTab'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="assetTabs" :targetTab.sync="targetTab" @changeTab="changeTab"></panel-tab-new>
+        <alertMessageTabNew v-if="from === fromRoute.asset && targetTab === 'alertMessageTab'" v-show="subResizeShow" :sign="sign+'alert'" :from="from" :obj="obj" :tabs="assetTabs" :targetTab.sync="targetTab" @changeTab="changeTab" ></alertMessageTabNew>
+        <endpointTabNew v-if="from === fromRoute.asset && targetTab === 'endpointTab'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="assetTabs" :targetTab.sync="targetTab" @changeTab="changeTab"></endpointTabNew>
+        <log-bottom-tab v-if="from === fromRoute.asset && targetTab === 'log'" v-show="subResizeShow" :sign="sign+'log'" :from="from" :obj="obj" :tabs="assetTabs" :targetTab.sync="targetTab" @changeTab="changeTab"></log-bottom-tab>
+        <process-bottom-tab v-if="from === fromRoute.asset && targetTab === 'process' && obj.clientState == '1'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="assetTabs" :targetTab.sync="targetTab" @changeTab="changeTab"></process-bottom-tab>
+        <assetSubTab v-if="from === fromRoute.asset && targetTab === 'assetSubTab' && obj.childrenNum" v-show="subResizeShow" :from="from" :obj="obj" :tabs="assetTabs" @changeTab="changeTab" :targetTab.sync="targetTab"></assetSubTab>
         <!--module列表的tab-->
         <endpointTabNew v-if="from === fromRoute.module && targetTab === 'endpoint'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="tabs.module.moduleTabTitle" :targetTab="targetTab" @changeTab="changeTab"></endpointTabNew>
         <alertMessageTabNew v-if="from === fromRoute.module && targetTab === 'moduleAlertMessage'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="tabs.module.moduleTabTitle" @changeTab="changeTab" :targetTab="targetTab"></alertMessageTabNew>
@@ -92,6 +93,7 @@ import terminalLogTab from './tabs/terminalLogTab'
 import assetTab from '@/components/common/bottomBox/tabs/assetTab'
 import { fromRoute } from '@/components/common/js/constants'
 import LogBottomTab from '@/components/common/bottomBox/tabs/logBottomTab'
+import processBottomTab from '@/components/common/bottomBox/tabs/processBottomTab'
 import scrapeEndpoint from '@/components/common/bottomBox/tabs/scrapeEndpoint'
 import IpDetails from '@/components/common/bottomBox/tabs/IpDetails'
 import recordRuleEvalLog from '@/components/common/bottomBox/tabs/recordRuleEvalLog'
@@ -103,6 +105,7 @@ export default {
   components: {
     scrapeEndpoint,
     LogBottomTab,
+    processBottomTab,
     cabinetTab,
     alertMessageTab,
     endpointTab,
@@ -135,22 +138,21 @@ export default {
     obj: {
       immediate: true,
       handler (n) {
-        if ((this.from === fromRoute.asset) && n) {
-          const assetSub = { prop: 'assetSubTab', name: this.$t('overall.assetSubTab'), active: false }
-          if (n.childrenNum) {
-            if (!this.tabs.asset.panel.find(item => item.prop === assetSub.prop)) {
-              this.tabs.asset.panel.push(assetSub)
-              this.tabs.asset.alertMessage.push(assetSub)
-              this.tabs.asset.endpoint.push(assetSub)
-              this.tabs.asset.log.push(assetSub)
-            }
-          } else if (this.tabs.asset.panel.find(item => item.prop === assetSub.prop)) {
-            this.tabs.asset.panel = this.tabs.asset.panel.filter(item => item.prop !== assetSub.prop)
-            this.tabs.asset.alertMessage = this.tabs.asset.alertMessage.filter(item => item.prop !== assetSub.prop)
-            this.tabs.asset.endpoint = this.tabs.asset.endpoint.filter(item => item.prop !== assetSub.prop)
-            this.tabs.asset.log = this.tabs.asset.log.filter(item => item.prop !== assetSub.prop)
-          }
-        }
+        // if ((this.from === fromRoute.asset) && n) {
+        //   const assetSub = { prop: 'assetSubTab', name: this.$t('overall.assetSubTab'), active: false }
+        //   if (n.childrenNum) {
+        //     if (!this.tabs.asset.panel.find(item => item.prop === assetSub.prop)) {
+        //       this.tabs.asset.panel.push(assetSub)
+        //       this.tabs.asset.alertMessage.push(assetSub)
+        //       this.tabs.asset.endpoint.push(assetSub)
+        //       this.tabs.asset.log.push(assetSub)
+        //     }
+        //   } else if (this.tabs.asset.panel.find(item => item.prop === assetSub.prop)) {
+        //     this.tabs.asset.panel = this.tabs.asset.panel.filter(item => item.prop !== assetSub.prop)
+        //     this.tabs.asset.alertMessage = this.tabs.asset.alertMessage.filter(item => item.prop !== assetSub.prop)
+        //     this.tabs.asset.endpoint = this.tabs.asset.endpoint.filter(item => item.prop !== assetSub.prop)
+        //     this.tabs.asset.log = this.tabs.asset.log.filter(item => item.prop !== assetSub.prop)
+        //   }
       }
     }
   },
@@ -183,37 +185,43 @@ export default {
           // module tab
         },
         asset: {
-          panel: [
-            { prop: 'panelTab', name: this.$t('overall.dashboard'), active: true },
-            { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: false },
-            { prop: 'endpointTab', name: this.$t('asset.endpoint'), active: false },
-            { prop: 'log', name: this.$t('dashboard.panel.chartForm.typeVal.log.label'), active: false }
-          ],
-          alertMessage: [
-            { prop: 'panelTab', name: this.$t('overall.dashboard'), active: false },
-            { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: true },
-            { prop: 'endpointTab', name: this.$t('asset.endpoint'), active: false },
-            { prop: 'log', name: this.$t('dashboard.panel.chartForm.typeVal.log.label'), active: false }
-          ],
-          endpoint: [
-            { prop: 'panelTab', name: this.$t('overall.dashboard'), active: false },
-            { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: false },
-            { prop: 'endpointTab', name: this.$t('asset.endpoint'), active: true },
-            { prop: 'log', name: this.$t('dashboard.panel.chartForm.typeVal.log.label'), active: false }
-          ],
-          log: [
-            { prop: 'panelTab', name: this.$t('overall.dashboard'), active: false },
-            { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: false },
-            { prop: 'endpointTab', name: this.$t('asset.endpoint'), active: false },
-            { prop: 'log', name: this.$t('dashboard.panel.chartForm.typeVal.log.label'), active: true }
-          ],
-          alertMessageSub: [
-            { prop: 'panelTab', name: this.$t('overall.dashboard'), active: false },
-            { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: false },
-            { prop: 'endpointTab', name: this.$t('asset.endpoint'), active: false },
-            { prop: 'log', name: this.$t('dashboard.panel.chartForm.typeVal.log.label'), active: false },
-            { prop: 'assetSubTab', name: this.$t('overall.assetSubTab'), active: true }
+          assetTabTitle: [
+            { prop: 'panelTab', name: this.$t('overall.dashboard') },
+            { prop: 'alertMessageTab', name: this.$t('overall.alert') },
+            { prop: 'endpointTab', name: this.$t('asset.endpoint') },
+            { prop: 'log', name: this.$t('dashboard.panel.chartForm.typeVal.log.label') }
           ]
+          // panel: [
+          //   { prop: 'panelTab', name: this.$t('overall.dashboard'), active: true },
+          //   { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: false },
+          //   { prop: 'endpointTab', name: this.$t('asset.endpoint'), active: false },
+          //   { prop: 'log', name: this.$t('dashboard.panel.chartForm.typeVal.log.label'), active: false }
+          // ],
+          // alertMessage: [
+          //   { prop: 'panelTab', name: this.$t('overall.dashboard'), active: false },
+          //   { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: true },
+          //   { prop: 'endpointTab', name: this.$t('asset.endpoint'), active: false },
+          //   { prop: 'log', name: this.$t('dashboard.panel.chartForm.typeVal.log.label'), active: false }
+          // ],
+          // endpoint: [
+          //   { prop: 'panelTab', name: this.$t('overall.dashboard'), active: false },
+          //   { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: false },
+          //   { prop: 'endpointTab', name: this.$t('asset.endpoint'), active: true },
+          //   { prop: 'log', name: this.$t('dashboard.panel.chartForm.typeVal.log.label'), active: false }
+          // ],
+          // log: [
+          //   { prop: 'panelTab', name: this.$t('overall.dashboard'), active: false },
+          //   { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: false },
+          //   { prop: 'endpointTab', name: this.$t('asset.endpoint'), active: false },
+          //   { prop: 'log', name: this.$t('dashboard.panel.chartForm.typeVal.log.label'), active: true }
+          // ],
+          // alertMessageSub: [
+          //   { prop: 'panelTab', name: this.$t('overall.dashboard'), active: false },
+          //   { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: false },
+          //   { prop: 'endpointTab', name: this.$t('asset.endpoint'), active: false },
+          //   { prop: 'log', name: this.$t('dashboard.panel.chartForm.typeVal.log.label'), active: false },
+          //   { prop: 'assetSubTab', name: this.$t('overall.assetSubTab'), active: true },
+          // ]
         },
         module: {
           moduleTabTitle: [
@@ -284,6 +292,23 @@ export default {
       const config = this.obj.configs.find(c => c.type === 'logs')
       return config && config.enable === 1
     },
+    assetTabs () {
+      const hasSub = this.obj && this.obj.childrenNum
+      const hasProcess = this.obj && this.obj.clientState == '1'
+      const tabs = [
+        { prop: 'panelTab', name: this.$t('overall.dashboard') },
+        { prop: 'alertMessageTab', name: this.$t('overall.alert') },
+        { prop: 'endpointTab', name: this.$t('asset.endpoint') },
+        { prop: 'log', name: this.$t('dashboard.panel.chartForm.typeVal.log.label') }
+      ]
+      if (hasSub) {
+        tabs.push({ prop: 'assetSubTab', name: this.$t('overall.assetSubTab') })
+      }
+      if (hasProcess) {
+        tabs.push({ prop: 'process', name: this.$t('overall.process') })
+      }
+      return tabs
+    },
     endpointTabs () {
       const config = this.obj.configs.find(c => c.type === 'logs')
       const hasLog = config && config.enable === 1
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/processBottomTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/processBottomTab.vue
new file mode 100644
index 000000000..9fb1efeae
--- /dev/null
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/processBottomTab.vue
@@ -0,0 +1,181 @@
+<template>
+  <nz-bottom-data-list
+      :showTitle='showTitle'
+      :obj='obj'
+    :api="url"
+    :custom-table-title.sync="tools.customTableTitle"
+    :layout="['elementSet']"
+    :search-msg="searchMsg"
+    :tabs="tabs"
+    :targetTab="targetTab"
+    :showPagination="false"
+    @search="search"
+    @changeTab="changeTab"
+  >
+    <template v-slot:title><span :title="obj.name">{{obj.name}}</span></template>
+    <template v-slot:top-tool-right>
+        <div class="top-tool-right">
+         <div class="top-tool-search margin-r-20">
+           <el-input ref="elementQuery"  @clear="clearInput" id="elementQuery" @focus="focusInput" @blur="blurInput" v-model="queryExpression" class="query-input-inactive" size="mini" clearable :placeholder="$t('project.endpoint.promExpr')" >
+              <i slot="suffix" class="el-input__icon nz-icon nz-icon-search" style="float:right" @click="focusInput"></i>
+            </el-input>
+         </div>
+         <pick-time
+              ref="pickTime"
+              v-model="searchTime"
+              :refresh-data-func="dateChange"
+              :showTimePicker="false"
+              :use-chart-unit="false"
+              class="pickTime margin-r-10">
+            </pick-time>
+        </div>
+    </template>
+    <template v-slot>
+      <assetProcessTable
+        ref="dataTable"
+        :orderByFa="'id'"
+        v-my-loading="tools.loading"
+        :loading="tools.loading"
+        :api="url"
+        :custom-table-title="tools.customTableTitle"
+        :height="subTableHeight"
+        :filterTime="filterTime"
+        :table-data="tableData"
+        :terminaLogTab="true"
+        :queryExpression="queryExpression"
+        @del="del"
+        @edit="edit"
+        @orderBy="tableDataSort"
+        @reload="getTableData"
+        @selectionChange="selectionChange"></assetProcessTable>
+    </template>
+    <template v-slot:pagination>
+      <Pagination ref="Pagination" :pageObj="pageObj" :tableId="tableId" @pageNo='pageNo' @pageSize='pageSize'></Pagination>
+    </template>
+  </nz-bottom-data-list>
+</template>
+
+<script>
+import bus from '@/libs/bus'
+import dataListMixin from '@/components/common/mixin/dataList'
+import subDataListMixin from '@/components/common/mixin/subDataList'
+import nzBottomDataList from '@/components/common/bottomBox/nzBottomDataList'
+import assetProcessTable from '@/components/common/table/asset/assetProcessTable'
+import detailViewRightMixin from '@/components/common/mixin/detailViewRightMixin'
+
+export default {
+  name: 'processBottomTab',
+  mixins: [dataListMixin, subDataListMixin, detailViewRightMixin],
+  components: {
+    nzBottomDataList,
+    assetProcessTable
+  },
+  props: {
+    obj: Object,
+    showTitle: {
+      type: Boolean,
+      default: true
+    }
+  },
+  watch: {
+    obj (n) {
+      this.searchLabel = { id: n.id }
+      this.getTableData()
+    },
+    queryExpression (n) {
+      const temp = this
+      setTimeout(function () {
+        temp.tableFilter()
+      }, 500)
+    }
+  },
+  data () {
+    return {
+      url: 'asset/oshi/process/1/',
+      tableId: 'assetProcessTable', // 需要分页的table的id，用于记录每页数量
+      searchMsg: { // 给搜索框子组件传递的信息
+        zheze_none: true,
+        searchLabelList: []
+      },
+      searchLabel: { id: this.obj.id },
+      queryExpression: '',
+      tableData: [],
+      tableDataCopy: '',
+      searchTime: bus.getTimezontDateRange(),
+      filterTime: [
+        bus.timeFormate(bus.getOffsetTimezoneData(-1), 'YYYY-MM-DD HH:mm:ss'),
+        bus.timeFormate(bus.getOffsetTimezoneData(), 'YYYY-MM-DD HH:mm:ss')
+      ]
+    }
+  },
+  methods: {
+    getTableData (params) {
+      if (params && Object.keys(params).length > 0) {
+        for (const key in params) {
+          this.$set(this.searchLabel, key, params[key])
+        }
+      }
+      if (this.orderBy) {
+        this.$set(this.searchLabel, 'orderBy', this.orderBy)
+      } else {
+        delete this.searchLabel.orderBy
+      }
+      this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo)
+      this.$set(this.searchLabel, 'pageSize', -1)
+      this.tools.loading = true
+      if (this.obj) {
+        this.$set(this.searchLabel, 'id', this.obj.id)
+      }
+      this.tableDataCopy = ''
+      this.$get('asset/oshi/process?id=' + this.obj.id).then(response => {
+      // this.$get('/mock/asset/oshi/process').then(response => {
+        this.tools.loading = false
+        this.nowTime = this.utcTimeToTimezoneStr(response.time)
+        if (response.code === 200) {
+          this.tableData = response.data.list
+          this.tableDataCopy = JSON.stringify(this.tableData)
+          if (!this.scrollbarWrap && this.$refs.dataTable && this.$refs.dataTable.$refs.dataTable) {
+            this.$nextTick(() => {
+              this.scrollbarWrap = this.$refs.dataTable.$refs.dataTable.bodyWrapper
+              this.toTopBtnHandler(this.scrollbarWrap)
+            })
+          }
+        }
+      })
+    },
+    clearInput () {
+      this.$refs.elementQuery.focus()
+    },
+    focusInput () {
+      let classVal = document.getElementById('elementQuery').parentElement.getAttribute('class')
+      classVal = classVal.replace('query-input-inactive', 'query-input-active')
+      document.getElementById('elementQuery').parentElement.setAttribute('class', classVal)
+      this.$refs.elementQuery.focus()
+    },
+    blurInput () {
+      if (!this.queryExpression || this.queryExpression == '') {
+        setTimeout(function () {
+          let classVal = document.getElementById('elementQuery').parentElement.getAttribute('class')
+          classVal = classVal.replace('query-input-active', 'query-input-inactive')
+          document.getElementById('elementQuery').parentElement.setAttribute('class', classVal)
+        }, 100)
+      }
+    },
+    tableFilter () {
+      const tableDatas = JSON.parse(this.tableDataCopy)
+      this.tableData = tableDatas.filter((item) => {
+        const element = item.name
+        return element.indexOf(this.queryExpression) !== -1
+      })
+    },
+    dateChange () {
+      // const nowTimeType = this.$refs.pickTime.$refs.timePicker.nowTimeType
+      // this.setSearchTime(nowTimeType.type, nowTimeType.value)
+      this.searchTime = bus.getTimezontDateRange()
+      this.filterTime[0] = bus.timeFormate(this.searchTime[0], 'YYYY-MM-DD HH:mm:ss')
+      this.filterTime[1] = bus.timeFormate(this.searchTime[1], 'YYYY-MM-DD HH:mm:ss')
+      this.tableFilter()
+    }
+  }
+}
+</script>
diff --git a/nezha-fronted/src/components/common/mixin/routerPathParams.js b/nezha-fronted/src/components/common/mixin/routerPathParams.js
index 92a58a3c2..02d900ed1 100644
--- a/nezha-fronted/src/components/common/mixin/routerPathParams.js
+++ b/nezha-fronted/src/components/common/mixin/routerPathParams.js
@@ -86,7 +86,8 @@ export default {
             id: this.bottomBox.object.id,
             name: this.bottomBox.object.name,
             configs: this.bottomBox.object.configs ? this.bottomBox.object.configs.map(item => { return { type: item.type, enable: item.enable } }) : '',
-            childrenNum: this.bottomBox.object.childrenNum || ''
+            childrenNum: this.bottomBox.object.childrenNum || '',
+            clientState: this.bottomBox.object.clientState || ''
           })
           this.$router.replace({ path: path, query: params }).catch(err => {})
         } else if (from === 'nzDetailList' && this.detailViewRightObj) {
@@ -95,7 +96,8 @@ export default {
             id: this.detailViewRightObj.id,
             name: this.detailViewRightObj.name,
             configs: this.detailViewRightObj.configs ? this.detailViewRightObj.configs.map(item => { return { type: item.type, enable: item.enable } }) : '',
-            childrenNum: this.detailViewRightObj.childrenNum || ''
+            childrenNum: this.detailViewRightObj.childrenNum || '',
+            clientState: this.bottomBox.object.clientState || ''
           })
           this.$router.replace({ path: path, query: params }).catch(err => {})
         } else if (from === 'bottomBox' && this.targetTab) {
diff --git a/nezha-fronted/src/components/common/table/asset/assetProcessTable.vue b/nezha-fronted/src/components/common/table/asset/assetProcessTable.vue
new file mode 100644
index 000000000..a88ca74b7
--- /dev/null
+++ b/nezha-fronted/src/components/common/table/asset/assetProcessTable.vue
@@ -0,0 +1,191 @@
+<template>
+  <el-table
+    id="assetProcessTable"
+    ref="dataTable"
+    :data="tableData"
+    :height="height"
+    tooltip-effect="light"
+    border
+    @header-dragend="dragend"
+    @sort-change="tableDataSort"
+    @selection-change="selectionChange"
+    @row-dblclick="(row)=>{queryMessage(row)}"
+  >
+    <el-table-column
+      :resizable="false"
+      align="center"
+      type="selection"
+      width="55">
+    </el-table-column>
+    <el-table-column
+      v-for="(item, index) in customTableTitle"
+      v-if="item.show"
+      :key="`col-${index}`"
+      :fixed="item.fixed"
+      :label="item.label"
+      :min-width="`${item.minWidth}`"
+      :prop="item.prop"
+      :resizable="true"
+      :sort-orders="['ascending', 'descending']"
+      :sortable="item.sortable"
+      :width="`${item.width}`"
+      :show-overflow-tooltip="item.prop === 'description'"
+      class="data-column"
+    >
+      <template slot="header">
+        <span class="data-column__span">{{item.label}}</span>
+        <div class="col-resize-area"></div>
+      </template>
+      <template slot-scope="scope" :column="item">
+        <template v-if="item.prop === 'name'">
+          <div style="height:100%;display: flex;align-items: center;">
+             <el-popover trigger="hover" placement="right-start" v-if="typeof scope.row.name != 'undefined' && scope.row.name != null">
+                <div>
+                  <ul>
+                   <li><span class="metirc-tip-list">{{$t('overall.state')}}&nbsp;:&nbsp;&nbsp;</span><span>{{'{ '+ scope.row.state +' }'}}</span></li>
+                  </ul>
+                </div>
+                <div slot="reference"><div :class="{'bar active-icon green-bg':scope.row.state.toLowerCase() == 'running','bar active-icon red-bg':scope.row.state.toLowerCase() != 'running'}"></div></div>
+             </el-popover>
+             <span>{{scope.row[item.prop]}}</span>
+          </div>
+        </template>
+        <template v-else-if="item.prop === 'startTime'">
+          {{utcTimeToTimezoneStr(scope.row[item.prop])}}
+        </template>
+        <template v-else-if="item.prop === 'cpuUsage'">
+            <div style="height:100%;">
+                <progress id="container" max="100" :value= scope.row[item.prop]></progress>
+                <div style="float:left">{{scope.row[item.prop] + '%'}}</div>
+            </div>
+        </template>
+        <template v-else-if="item.prop === 'memUsage'">
+            <div style="height:100%;">
+                <progress id="container" max="100" :value= scope.row[item.prop]></progress>
+                <div style="float:left">{{scope.row[item.prop] + '%'}}</div>
+            </div>
+        </template>
+        <span v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</span>
+        <template v-else>-</template>
+      </template>
+    </el-table-column>
+    <template slot="empty">
+      <div  v-if="!loading"  class="table-no-data">
+        <svg class="icon" aria-hidden="true">
+          <use xlink:href="#nz-icon-no-data-list"></use>
+        </svg>
+        <div class="table-no-data__title">No results found</div>
+      </div>
+      <div v-else>&nbsp;</div>
+    </template>
+  </el-table>
+</template>
+
+<script>
+import table from '@/components/common/mixin/table'
+export default {
+  name: 'assetProcessTable',
+  mixins: [table],
+  props: {
+    loading: Boolean,
+    filterTime: {}
+  },
+  data () {
+    return {
+      tableTitle: [
+        {
+          label: this.$t('overall.process'),
+          prop: 'name',
+          show: true,
+          minWidth: 250,
+          sortable: 'custom'
+        }, {
+          label: this.$t('asset.process.PID'),
+          prop: 'processID',
+          show: true,
+          minWidth: 100,
+          sortable: 'custom'
+        }, {
+          label: 'PPID',
+          prop: 'parentProcessID',
+          show: false,
+          minWidth: 100,
+          sortable: 'custom'
+        }, {
+          label: this.$t('overall.startTime'),
+          prop: 'startTime',
+          show: true,
+          minWidth: 150,
+          sortable: 'custom'
+        }, {
+          label: '%' + this.$t('asset.process.cpu'),
+          prop: 'cpuUsage',
+          show: true,
+          minWidth: 200,
+          sortable: 'custom'
+        }, {
+          label: '%' + this.$t('asset.process.mem'),
+          prop: 'memUsage',
+          show: true,
+          minWidth: 200,
+          sortable: 'custom'
+        }, {
+          label: this.$t('config.operationlog.username'),
+          prop: 'user',
+          show: false,
+          minWidth: 120,
+          sortable: 'custom'
+        }, {
+          label: this.$t('dashboard.panel.chartForm.group'),
+          prop: 'group',
+          show: false,
+          minWidth: 120,
+          sortable: 'custom'
+        }, {
+          label: this.$t('overall.state'),
+          prop: 'state',
+          show: false,
+          minWidth: 120
+        }, {
+          label: this.$t('asset.process.threadCount'),
+          prop: 'threadCount',
+          show: false,
+          minWidth: 150,
+          sortable: 'custom'
+        }
+      ]
+    }
+  },
+  computed: {
+  },
+  methods: {
+  }
+}
+</script>
+<style scoped>
+.el-popover__reference{
+  display: flex;
+  align-items: center;
+}
+.bar {
+  width: 3px;
+  height: 14px;
+  border-radius: 0;
+}
+#container {
+  float:left;
+  width: 120px;
+  height: 18px;
+  margin-right: 15px;
+  background-color: #e6eaed;
+}
+ /* 进度条被填充部分的背景颜色 */
+::-webkit-progress-value {
+     background-color: #00c398;
+ }
+  /deep/ .active-icon {
+    margin-left: 5px;
+  }
+</style>
+<style>
+</style>

From 2735cb822c577fc6df2762f207cd30266dbe4c1e Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 8 Sep 2022 18:16:42 +0800
Subject: [PATCH 34/37] =?UTF-8?q?NEZ-2187=20=20feat=EF=BC=9A=20alert=20sil?=
 =?UTF-8?q?ence=20state=20=E5=88=97=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/table/alert/alertSilenceTable.vue   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue b/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue
index 27c917dd5..c042c2c78 100644
--- a/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue
@@ -80,15 +80,15 @@
           </span>
         </template>
         <template v-else-if="item.prop === 'state'">
-          <span v-if="scope.row.state === 1" class="silence-active"
-            >{{$t('silence.active')}}</span
-          >
-          <span v-if="scope.row.state === 2" class="silence-pending"
-            >{{$t('silence.pending')}}</span
-          >
-          <span v-if="scope.row.state === 3" class="silence-expired"
-            >{{$t('silence.expired')}}</span
-          >
+          <span v-if="scope.row.state === 1">
+             <div class="active-icon green-bg inline-block"></div>
+            {{$t('silence.active')}}</span>
+          <span v-if="scope.row.state === 2">
+            <div class="active-icon green-bg inline-block"></div>
+            {{$t('silence.pending')}}</span>
+          <span v-if="scope.row.state === 3">
+            <div class="active-icon gray-bg inline-block"></div>
+            {{$t('silence.expired')}}</span>
         </template>
         <template v-else-if="item.prop === 'utime'">
           {{ utcTimeToTimezoneStr(scope.row[item.prop]) }}

From 9034d53712cd07610a3b23b23572413f4f2842ef Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 9 Sep 2022 09:29:52 +0800
Subject: [PATCH 35/37] =?UTF-8?q?NEZ-2187=20fix=EF=BC=9Apedding=20?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/css/common.scss                       | 3 +++
 .../src/components/common/table/alert/alertSilenceTable.vue    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss
index a64d39daa..732618b6b 100644
--- a/nezha-fronted/src/assets/css/common.scss
+++ b/nezha-fronted/src/assets/css/common.scss
@@ -110,6 +110,9 @@
 .color23bf9a {
   color: #23bf9a;
 }
+.bgFFECD9{
+  background: $--color-primary !important;
+}
 .timezone-area {
   display: inline-block;
   vertical-align: middle;
diff --git a/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue b/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue
index c042c2c78..238b7d085 100644
--- a/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue
@@ -84,7 +84,7 @@
              <div class="active-icon green-bg inline-block"></div>
             {{$t('silence.active')}}</span>
           <span v-if="scope.row.state === 2">
-            <div class="active-icon green-bg inline-block"></div>
+            <div class="active-icon bgFFECD9 inline-block"></div>
             {{$t('silence.pending')}}</span>
           <span v-if="scope.row.state === 3">
             <div class="active-icon gray-bg inline-block"></div>

From 786ef245592ce319b14a60e7df50823633aa025b Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 9 Sep 2022 09:30:10 +0800
Subject: [PATCH 36/37] =?UTF-8?q?NEZ-2193=20fix=EF=BC=9Aasset=20=E8=AF=A6?=
 =?UTF-8?q?=E7=BB=86=E8=A7=86=E5=9B=BE=20=E9=A1=B5=E9=9D=A2=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/detailView/view/detailViewRight.vue         | 10 ++++++----
 .../src/components/common/mixin/routerPathParams.js    |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/components/common/detailView/view/detailViewRight.vue b/nezha-fronted/src/components/common/detailView/view/detailViewRight.vue
index 33e43ea6a..2ce99fca4 100644
--- a/nezha-fronted/src/components/common/detailView/view/detailViewRight.vue
+++ b/nezha-fronted/src/components/common/detailView/view/detailViewRight.vue
@@ -103,7 +103,7 @@ export default {
     from: {
       immediate: true,
       handler (n) {
-        this.setTargetTab()
+        this.setTargetTab(true)
       }
     },
     obj: {
@@ -294,9 +294,11 @@ export default {
     getTableData () {
       this.$emit('getTableData')
     },
-    setTargetTab () {
-      if (this.$route.query.targetTab) {
-        this.targetTab = this.$route.query.targetTab
+    setTargetTab (flag) {
+      if (this.$route.query.targetTab && flag) {
+        this.$nextTick(()=>{
+          this.targetTab = this.$route.query.targetTab
+        })
         return
       }
       if (this.from === fromRoute.asset) {
diff --git a/nezha-fronted/src/components/common/mixin/routerPathParams.js b/nezha-fronted/src/components/common/mixin/routerPathParams.js
index 02d900ed1..661e473ae 100644
--- a/nezha-fronted/src/components/common/mixin/routerPathParams.js
+++ b/nezha-fronted/src/components/common/mixin/routerPathParams.js
@@ -97,7 +97,7 @@ export default {
             name: this.detailViewRightObj.name,
             configs: this.detailViewRightObj.configs ? this.detailViewRightObj.configs.map(item => { return { type: item.type, enable: item.enable } }) : '',
             childrenNum: this.detailViewRightObj.childrenNum || '',
-            clientState: this.bottomBox.object.clientState || ''
+            clientState: this.detailViewRightObj.clientState || ''
           })
           this.$router.replace({ path: path, query: params }).catch(err => {})
         } else if (from === 'bottomBox' && this.targetTab) {

From a0ceac78cd83f9d8b653f4763abc18e4a4840015 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 9 Sep 2022 09:43:14 +0800
Subject: [PATCH 37/37] =?UTF-8?q?NEZ-2192=20fix=EF=BC=9A=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E5=90=8E=20=E7=82=B9=E5=87=BB=E6=8A=A5=E9=94=99=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=20=E6=8F=90=E7=A4=BA=E6=A1=86=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E5=A4=9A=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/js/tools.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/components/common/js/tools.js b/nezha-fronted/src/components/common/js/tools.js
index 06f452093..f75b807c4 100644
--- a/nezha-fronted/src/components/common/js/tools.js
+++ b/nezha-fronted/src/components/common/js/tools.js
@@ -38,17 +38,22 @@ export const clickoutside = {
         }
         if (oldValue) {
           // const newValue = JSON.parse(JSON.stringify(binding.value.obj))
-          if (unsavedChange == 'on' && !isEqual(oldValue, el.__newValue__)) {
+          if (unsavedChange == 'on' && !isEqual(oldValue, el.__newValue__) && !el.isShow) {
+            el.isShow = true
             MessageBox.confirm(i18n.t('tip.confirmCancel'), {
               confirmButtonText: i18n.t('tip.yes'),
               cancelButtonText: i18n.t('tip.no'),
               type: 'warning'
             }).then(() => {
+              el.isShow = false
               if (binding.value.func) {
                 binding.value.func()
               }
-            }).catch(err => err)
-          } else {
+            }).catch(err => {
+              el.isShow = false
+              console.log(err)
+            })
+          } else if (!el.isShow) {
             binding.value.func()
           }
         } else {