闫腾 2 лет назад
Родитель
Сommit
de899f58c6

+ 5 - 10
Web/src/components/importButton/index.vue

@@ -1,12 +1,14 @@
 <template>
 	<input class="el-upload__input" ref="reffile" name="file" @change="fileChange($event)" :accept="$props.accept" type="file">
-	<el-button  icon="ele-Upload" @click="onClick">{{$props.btnText}}</el-button>
+	<el-button  icon="ele-Upload" @click="onClick">
+		<slot></slot>
+	</el-button>
 </template>
 
 <script setup lang="ts" name="ImportButton">
 
 import { reactive, ref, onMounted, watch } from 'vue';
-import request,{request2} from '/@/utils/request';
+import {request2} from '/@/utils/request';
 import { ElMessage } from 'element-plus';
 
 // 定义父组件传过来的值
@@ -20,10 +22,7 @@ const props = defineProps({
 	},
 	url: {
 		type: String, 
-	}, 
-	btnText: {
-		type: String, 
-	},
+	},  
 });
 
 // 定义子组件向父组件传值/事件
@@ -79,9 +78,5 @@ function fileChange(event) {
 		alert('上传错误')
 	});
 }
-// 页面加载时
-onMounted(() => {
-	// initFormField();
-});
 </script>
  

+ 1 - 3
Web/src/views/main/dm_ApplyDemo/index.vue

@@ -51,8 +51,7 @@
 								
 								<el-button icon="ele-Download" @click="exportData" > 导出数据 </el-button>
 
-								<ImportButton accept=".xlsx" url="/api/dm_ApplyDemo/import" 
-								btnText="导入数据" @success="handleQuery"/> 
+								<ImportButton accept=".xlsx" url="/api/dm_ApplyDemo/import" @success="handleQuery">导入数据</ImportButton> 
 					</el-col>
 				</el-row>
 			</el-form>
@@ -110,7 +109,6 @@ import editDialog from '/@/views/main/dm_ApplyDemo/component/editDialog.vue';
 import { pageDm_ApplyDemo, deleteDm_ApplyDemo,exportDm_ApplyDemo as exportData } from '/@/api/main/dm_ApplyDemo';
 import ImportButton from '/@/components/importButton/index.vue';
 
-const baseUrl = window.__env__.VITE_API_URL;
 const showAdvanceQueryUI = ref(false);
 const printDialogRef = ref();
 const editDialogRef = ref();