Merge branch 'VERSIONS-menJin' into SCHOOL-XiBeiNongLin

src/views/safetyCheck/dataStatistics/hiddenDangerStatistics.vue

@@ -503,7 +503,7 @@
               reportHazardReportOneItemsScatterTop(obj).then(response => {
                 this.$set(this, 'formTitleData', response.data)
               })
-              this.$set(this.exportConfig, 'api', '/report/hazardReport/oneItemsExport')
+              this.$set(this.exportConfig, 'api', '/security/checkDanger/oneItemsExport')
               this.$set(this.exportConfig, 'fileName', '一级检查项隐患分布')
             })
           })

src/views/secureAccess/globalWhitelistConfiguration/index.vue

@@ -58,7 +58,7 @@
       </div>
     </div>
     <!--新增弹窗-->
-    <el-dialog class="globalWhitelistConfiguration-dialog" title='设备地址' width="800px" append-to-body
+    <el-dialog class="globalWhitelistConfiguration-dialog" title='新增' width="800px" append-to-body
                :visible.sync="dialogType" v-if="dialogType" @close="dialogOff()"
                :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form :model="dialogForm" ref="dialogForm" class="dialog-top-box" :inline="true" label-width="80px">