Просмотр исходного кода

!576 文件上传按钮权限问题和其他小调整
Merge pull request !576 from 写意/next

zuohuaijun 3 лет назад
Родитель
Сommit
5c19924c73

+ 2 - 2
Web/index.html

@@ -17,7 +17,7 @@
 	</head>
 	<body>
 		<div id="app"></div>
-		<script>
+		<!-- <script>
 			var _hmt = _hmt || [];
 			(function() {
 			  var hm = document.createElement("script");
@@ -25,7 +25,7 @@
 			  var s = document.getElementsByTagName("script")[0]; 
 			  s.parentNode.insertBefore(hm, s);
 			})();
-			</script>
+			</script> -->
 		<script type="module" src="/src/main.ts"></script>
 		<!-- <script type="text/javascript" src="https://api.map.baidu.com/api?v=3.0&ak=wsijQt8sLXrCW71YesmispvYHitfG9gv&s=1"></script> -->
 	</body>

+ 3 - 2
Web/src/views/system/file/index.vue

@@ -18,7 +18,7 @@
 				<el-form-item>
 					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
 					<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysFile:page'"> 查询 </el-button>
-					<el-button icon="ele-UploadFilled" @click="openUploadDialog" v-auth="'sysFile:upload'"> 上传 </el-button>
+					<el-button icon="ele-UploadFilled" @click="openUploadDialog" v-auth="'sysFile:uploadFile'"> 上传 </el-button>
 				</el-form-item>
 			</el-form>
 		</el-card>
@@ -53,7 +53,7 @@
 				<el-table-column prop="createTime" label="创建时间" align="center" show-overflow-tooltip />
 				<el-table-column label="操作" width="140" fixed="right" align="center" show-overflow-tooltip>
 					<template #default="scope">
-						<el-button icon="ele-Download" size="small" text type="primary" @click="downloadFile(scope.row)" v-auth="'sysFile:download'"> 下载 </el-button>
+						<el-button icon="ele-Download" size="small" text type="primary" @click="downloadFile(scope.row)" v-auth="'sysFile:downloadFile'"> 下载 </el-button>
 						<el-button icon="ele-Delete" size="small" text type="danger" @click="delFile(scope.row)" v-auth="'sysFile:delete'"> 删除 </el-button>
 					</template>
 				</el-table-column>
@@ -163,6 +163,7 @@ const resetQuery = () => {
 
 // 打开上传页面
 const openUploadDialog = () => {
+	state.fileList = [];
 	state.dialogVisible = true;
 };
 

+ 1 - 1
Web/src/views/system/job/component/editJobTrigger.vue

@@ -172,7 +172,7 @@ const macroData: MacroData[] = reactive([
 	{ key: '@hourly', description: '每小时 00:00' },
 	{ key: '@daily', description: '每天 00:00:00' },
 	{ key: '@monthly', description: '每月 1 号 00:00:00' },
-	{ key: '@weekly', description: '每周日 00:00:00' },
+	{ key: '@weekly', description: '每周日 00:00:00' },
 	{ key: '@yearly', description: '每年 1 月 1 号 00:00:00' },
 	{ key: '@workday', description: '每周一至周五 00:00:00' },
 ]);