fix：修复图表 最大值取错值的问题 依旧修改SNMP MIB 下拉样式错乱的问提

6 files changed, 22 insertions, 24 deletions

diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue
index be3a0d946..9cdaec2f3 100644
--- a/nezha-fronted/src/components/charts/line-chart-block.vue
+++ b/nezha-fronted/src/components/charts/line-chart-block.vue
@@ -593,7 +593,7 @@ export default {
       let maxValue = maxValueCopies.maxValue
       // let minValue = maxValueCopies.minValue
       if (chartInfo.unit && dataArg.length > 0) {
-        maxValue = dataArg[0].data[0][1]
+        // maxValue = dataArg[0].data[0][1]
         // minValue = dataArg[0].data[0][1]
         for (let j = 0; j < dataArg.length; j++) {
           dataArg[j].showAllSymbol = false
diff --git a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
index 90715d3a7..2243070ab 100644
--- a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
+++ b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
@@ -1189,11 +1189,7 @@ export default {
         }
       })
     },
-    tabClick (n) {
-      if (this.selection.pen && this.tab == '1') {
-
-      }
-    },
+    tabClick (n) { },
     moduleIdChange (n) {
       this.selection.pen.data.moduleName = this.modules.find(item => item.id === n).name
       if (!this.selection.pen.data.title) {
diff --git a/nezha-fronted/src/components/common/project/topologyPrev.vue b/nezha-fronted/src/components/common/project/topologyPrev.vue
index bc599e1d0..0fdb6aaf7 100644
--- a/nezha-fronted/src/components/common/project/topologyPrev.vue
+++ b/nezha-fronted/src/components/common/project/topologyPrev.vue
@@ -1710,20 +1710,20 @@
         if (url) {
           return new Promise((resolve, reject) => {
             this.$axios
-              .get(url, {
-                responseType: 'arraybuffer'
-              })
-              .then(res => {
-                return ('data:image/jpeg;base64,' + btoa(new Uint8Array(res.data).reduce((data, byte) => data + String.fromCharCode(byte), '')))
-              })
-              .then(data => {
-                resolve(data)
-                // changeImage(data,(img)=>{
-                //   resolve(img)
-                // })
-              })
-              .catch(err => {
-              })
+            .get(url, {
+              responseType: 'arraybuffer'
+            })
+            .then(res => {
+              return ('data:image/jpeg;base64,' + btoa(new Uint8Array(res.data).reduce((data, byte) => data + String.fromCharCode(byte), '')))
+            })
+            .then(data => {
+              resolve(data)
+              // changeImage(data,(img)=>{
+              //   resolve(img)
+              // })
+            })
+            .catch(err => {
+            })
           })
         }
       },
@@ -2495,7 +2495,7 @@
     }
   }
 
-  .project-box{
+  .project-box {
     width: 100%;
     height: calc(100% - 20px);
     margin-top: 10px;
diff --git a/nezha-fronted/src/components/common/searchInput.vue b/nezha-fronted/src/components/common/searchInput.vue
index c3d6e1969..dbb822e74 100644
--- a/nezha-fronted/src/components/common/searchInput.vue
+++ b/nezha-fronted/src/components/common/searchInput.vue
@@ -198,7 +198,7 @@ export default {
   name: 'index',
   data () {
     return {
-      selectDom: { top: '', left:'', tempTop: '', show: true }, // 选择弹框的位置
+      selectDom: { top: '', left: '', tempTop: '', show: true }, // 选择弹框的位置
       clearSearchShow: false,
       select_conditionsName: '',
       selectInfoList: searchSelectInfo,
diff --git a/nezha-fronted/src/components/page/config/exprTemp.vue b/nezha-fronted/src/components/page/config/exprTemp.vue
index c33fabfe6..c689f10e0 100644
--- a/nezha-fronted/src/components/page/config/exprTemp.vue
+++ b/nezha-fronted/src/components/page/config/exprTemp.vue
@@ -77,7 +77,7 @@
         <template slot-scope="scope" :column="item">
           <div v-if="item.prop == 'option'" class="content-right-options">
             <span :id="'alert-edit-'+scope.row.id" :title="$t('overall.edit')" @click.stop="edit(scope.row)"
-                  class="content-right-option" v-has="'expr_temp_update'">
+                  class="content-right-option" v-has="'expr_temp_update'" v-if="scope.row.buildIn !== 1">
               <i class="nz-icon nz-icon-edit"></i>
             </span>
             <span
@@ -85,7 +85,8 @@
               :title="$t('overall.delete')"
               @click="del(scope.row)"
               class="content-right-option"
-              v-has="'expr_temp_delete'">
+              v-has="'expr_temp_delete'"
+              v-if="scope.row.buildIn !== 1">
               <i  class="nz-icon nz-icon-delete"></i>
             </span>
             <span
diff --git a/nezha-fronted/src/components/page/config/mibBrowser.vue b/nezha-fronted/src/components/page/config/mibBrowser.vue
index 4885ed3d5..523056d17 100644
--- a/nezha-fronted/src/components/page/config/mibBrowser.vue
+++ b/nezha-fronted/src/components/page/config/mibBrowser.vue
@@ -655,6 +655,7 @@ export default {
 }
 .mib-browser-model-dropdown {
   height: 300px;
+  overflow-y: auto;
 }
 .mib-browser {
   .top-tool-search .el-input__inner {