perf: 修复二级列表展开时import弹框不可见问题

nezha-fronted/src/assets/stylus/main.scss

@@ -583,8 +583,8 @@ li{
   margin-top: -2px;
 }*/
 .top-tool-main-right-to-left {
-  right: 100% !important;
+  right: calc(100% - 341px) !important;
-  transform: translateX(100%);
+  /*transform: translateX(100%);*/
 }
 /* end--顶部工具栏*/
 

nezha-fronted/src/components/charts/chartDataFormat.js

@@ -255,19 +255,13 @@ function days(value,index,type=1){
 * unitIndex：不需要传递，用于递归获取units中的单位
 * */
 function asciiCompute(num,ascii,units,dot=2,unitIndex=0){
-  console.info(parseFloat(0.6.toFixed(2)))
   let quotient=num / ascii;
-  console.info("aa", parseFloat(0.6.toFixed(0)), parseFloat(0.6.toFixed(1)));
-  console.info("quotient", quotient);
   if(unitIndex <= units.length-1){
     if(quotient <1 ){ //不足以进位
       let toFixed=parseFloat(num.toFixed(dot));
-      console.info("toFixed", num, dot, toFixed);
       if(toFixed == 0){
-        console.info("toFixed-r1", `${num} ${units[unitIndex]}`);
         return `${num} ${units[unitIndex]}`
       }else{
-        console.info("toFixed-r2", `${num.toFixed(dot)} ${units[unitIndex]}`);
         return `${num.toFixed(dot)} ${units[unitIndex]}`;
       }
     }else if(quotient >= 1 && quotient <10){ //可以进位，但是又不足以更进一位

nezha-fronted/src/components/common/exportXLSX.vue

@@ -18,81 +18,79 @@
       </el-dropdown>-->
     </div>
 
-    <div>
+    <el-dialog :visible.sync="importBox.show" :title="importBox.title" :modal-append-to-body='false' :show-close="true" :width="importBox.width" @close="closeDialog" class="nz-dialog" :close-on-click-modal="importBox.type!=3">
-      <el-dialog :visible.sync="importBox.show" :title="importBox.title" :modal-append-to-body='false' :show-close="true" :width="importBox.width" @close="closeDialog" class="nz-dialog" :close-on-click-modal="importBox.type!=3">
+      <div v-if="importBox.type==1">
-        <div v-if="importBox.type==1">
+        <div class="upload-body">
-          <div class="upload-body">
+          <el-upload drag class="upload-demo" ref="uploadExcel"  action="" :file-list="importFileList" :on-change="importChange"  :auto-upload="false" accept=".xlsx,.xls">
-            <el-upload drag class="upload-demo" ref="uploadExcel"  action="" :file-list="importFileList" :on-change="importChange"  :auto-upload="false" accept=".xlsx,.xls">
+            <div slot="tip" class="el-upload__tip" >{{$t('overall.importTip')}}</div>
-              <div slot="tip" class="el-upload__tip" >{{$t('overall.importTip')}}</div>
+            <i class="el-icon-upload"></i>
-              <i class="el-icon-upload"></i>
+            <div class="el-upload__text">{{$t('overall.dragFileTip')}}，{{$t('overall.or')}}&nbsp;<em>{{$t('overall.clickUpload')}}</em></div>
-              <div class="el-upload__text">{{$t('overall.dragFileTip')}}，{{$t('overall.or')}}&nbsp;<em>{{$t('overall.clickUpload')}}</em></div>
+            <!--<button type="button" class="nz-btn nz-btn-size-normal nz-btn-style-normal">
-              <!--<button type="button" class="nz-btn nz-btn-size-normal nz-btn-style-normal">
+              <span class="top-tool-btn-txt" >{{$t('overall.upload')}}</span>
-                <span class="top-tool-btn-txt" >{{$t('overall.upload')}}</span>
+            </button>-->
-              </button>-->
+          </el-upload>
-            </el-upload>
+        </div>
+        <div slot="footer" class="footer">
+          <div class="el-message-box__btns" style="text-align: right;">
+            <button @click="downloadTemplate"  class="el-button el-button--default el-button--small">
+              <span>{{$t('overall.template')}}</span>
+            </button>
+            <button  @click="importExcel"  class="el-button el-button--default el-button--small">
+              <span>{{$t('overall.importExcel')}}</span>
+            </button>
+            <button @click="closeDialog"  class="el-button el-button--default el-button--small" >
+              <span>{{$t('overall.cancel')}}</span>
+            </button>
+          </div>
+        </div>
+      </div>
+      <div v-if="importBox.type == 2">
+        <div class="upload-body">
+          <button @click="exportCur"  class="el-button el-button--default el-button--small">
+            <span>{{$t('overall.exportCur')}}</span>
+          </button>
+          <button  @click="exportAll"  class="el-button el-button--default el-button--small">
+            <span>{{$t('overall.exportAll')}}</span>
+          </button>
+        </div>
+        <div slot="footer" class="footer">
+        </div>
+      </div>
+      <div v-if="importBox.type==3">
+          <div class="upload-body result-body">
+            <div>
+              <span class="result-title">{{$t('overall.result.total')}}:</span>
+              <span>{{importResult&&importResult.totalNum?importResult.totalNum:0}}</span>
+            </div>
+            <div>
+              <span class="result-title">{{$t('overall.result.failed')}}:</span>
+              <span>{{importResult&&importResult.failNum?importResult.failNum:0}}</span>
+              <span class="result-title">{{$t('overall.result.success')}}:</span>
+              <span>{{importResult&&importResult.successNum?importResult.successNum:0}}</span>
+            </div>
+            <div>
+              <div class="result-title">{{$t('overall.result.failedDetail')}}:</div>
+              <el-scrollbar style="height: 100%">
+                <div class="result-detail" v-if="importResult&&importResult.failDetail">
+                  <ul>
+                    <li v-for="(item,index) in importResult.failDetail"><span>{{item.lineNo}}</span>:<span>{{item.errorMsg}}</span> </li>
+                  </ul>
+                </div>
+              </el-scrollbar>
+            </div>
           </div>
           <div slot="footer" class="footer">
-            <div class="el-message-box__btns" style="text-align: right;">
+            <div class="el-message-box__btns">
-              <button @click="downloadTemplate"  class="el-button el-button--default el-button--small">
+              <button @click="rollbackImport"  class="el-button el-button--default el-button--small">
-                <span>{{$t('overall.template')}}</span>
+                <span>{{$t('overall.rollbackImport')}}</span>
               </button>
-              <button  @click="importExcel"  class="el-button el-button--default el-button--small">
+              <button  @click="closeDialog"  class="el-button el-button--default el-button--small">
-                <span>{{$t('overall.importExcel')}}</span>
-              </button>
-              <button @click="closeDialog"  class="el-button el-button--default el-button--small" >
                 <span>{{$t('overall.cancel')}}</span>
               </button>
             </div>
           </div>
-        </div>
+      </div>
-        <div v-if="importBox.type == 2">
+    </el-dialog>
-          <div class="upload-body">
-            <button @click="exportCur"  class="el-button el-button--default el-button--small">
-              <span>{{$t('overall.exportCur')}}</span>
-            </button>
-            <button  @click="exportAll"  class="el-button el-button--default el-button--small">
-              <span>{{$t('overall.exportAll')}}</span>
-            </button>
-          </div>
-          <div slot="footer" class="footer">
-          </div>
-        </div>
-        <div v-if="importBox.type==3">
-            <div class="upload-body result-body">
-              <div>
-                <span class="result-title">{{$t('overall.result.total')}}:</span>
-                <span>{{importResult&&importResult.totalNum?importResult.totalNum:0}}</span>
-              </div>
-              <div>
-                <span class="result-title">{{$t('overall.result.failed')}}:</span>
-                <span>{{importResult&&importResult.failNum?importResult.failNum:0}}</span>
-                <span class="result-title">{{$t('overall.result.success')}}:</span>
-                <span>{{importResult&&importResult.successNum?importResult.successNum:0}}</span>
-              </div>
-              <div>
-                <div class="result-title">{{$t('overall.result.failedDetail')}}:</div>
-                <el-scrollbar style="height: 100%">
-                  <div class="result-detail" v-if="importResult&&importResult.failDetail">
-                    <ul>
-                      <li v-for="(item,index) in importResult.failDetail"><span>{{item.lineNo}}</span>:<span>{{item.errorMsg}}</span> </li>
-                    </ul>
-                  </div>
-                </el-scrollbar>
-              </div>
-            </div>
-            <div slot="footer" class="footer">
-              <div class="el-message-box__btns">
-                <button @click="rollbackImport"  class="el-button el-button--default el-button--small">
-                  <span>{{$t('overall.rollbackImport')}}</span>
-                </button>
-                <button  @click="closeDialog"  class="el-button el-button--default el-button--small">
-                  <span>{{$t('overall.cancel')}}</span>
-                </button>
-              </div>
-            </div>
-        </div>
-      </el-dialog>
-    </div>
   </div>
 </template>
 

nezha-fronted/src/components/page/alert/list.vue

@@ -33,7 +33,7 @@
           <div class="pagination-top pagination-top-hide display-none"></div>
         </div>
         <transition name="el-zoom-in-bottom">
-          <div class="el-popover alert-clean-pop" @click="toDeleteMessage" v-if="deleteBox.ids.length > 0">
+          <div class="el-popover alert-clean-pop" @click="toDeleteMessage(false)" v-if="deleteBox.ids.length > 0">
             <i style="cursor: pointer" class="el-icon-delete"></i>
           </div>
         </transition>
@@ -130,7 +130,7 @@
               </div>
               <div v-else-if="item.prop == 'option'" class="content-right-options">
                 <span :title="$t('overall.view')" @click="detail(scope.row)" class="content-right-option" :id="'alert-list-detail-'+scope.row.id"><i class="nz-icon nz-icon-chart"></i></span>
-                <span :title="$t('overall.delete')" @click="del(scope.row)" class="content-right-option" :id="'alert-list-delete-'+scope.row.id"><i  class="el-icon-delete"></i></span>
+                <span :title="$t('overall.delete')" @click="toDeleteMessage(scope.row)" class="content-right-option" :id="'alert-list-delete-'+scope.row.id"><i  class="el-icon-delete"></i></span>
               </div>
               <span v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</span>
               <template v-else>-</template>
@@ -567,22 +567,6 @@
       dialogClose() {
         this.graphShow = false;
       },
-      del(u) {
-        this.$confirm(this.$t("tip.confirmDelete"), {
-          confirmButtonText: this.$t("tip.yes"),
-          cancelButtonText: this.$t("tip.no"),
-          type: 'warning'
-        }).then(() => {
-          this.$delete("alert/message?ids=" + u.id).then(response => {
-            if (response.code === 200) {
-              this.$message({type: 'success', message: this.$t("tip.deleteSuccess")});
-              this.getAlertList();
-            } else {
-              this.$message.error(response.msg);
-            }
-          })
-        });
-      },
       getAlertList: function () {
         this.$set(this.searchLabel, "pageNo", this.pageObj.pageNo);
         this.$set(this.searchLabel, "pageSize", this.pageObj.pageSize);
@@ -636,7 +620,10 @@
           this.$refs['assetEditUnit'].tabView = false
         }
       },
-      toDeleteMessage() {
+      toDeleteMessage(obj) {
+        if (obj) {
+          this.deleteBox.ids = obj.id + "";
+        }
         this.deleteBox.show = true;
       },
       deleteMessage() {