Merge branch 'master'

src/views/datasheet_manage/customAnalysis/list.vue

@@ -16,7 +16,7 @@
             style="margin-right:20px"
             :loading="isUploadLoading"
             @click="clickUpload"
-            v-if="permissionBtn.checkPermissionBtn(permissionBtn.etaTable_analysis_upload)"
+            v-if="permissionBtn.checkPermissionBtn(permissionBtn.etaTablePermission.etaTable_analysis_upload)"
           >上传文件</el-button>
           <input type="file" @change="fileSelected" id="file"  style="display: none;">
           

src/views/datasheet_manage/sheetList.vue

@@ -177,7 +177,7 @@
                 </li>
                 <li
                   class="editsty"
-                  @click="refreshSheet"
+                  @click="refreshSheetEdb"
                   v-if="sheetDetailInfo.Button.RefreshButton&&isSheetBtnShow('refresh')"
                 >
                   刷新
@@ -773,7 +773,7 @@ export default {
     },
 
     /* 刷新表格 */
-    refreshSheet: _.debounce(async function () {
+    refreshSheetEdb: _.debounce(async function () {
       const res = await sheetInterface.refreshCustomSheet({
         ExcelInfoId: this.sheetDetailInfo.ExcelInfoId,
       });