Merge branch 'master' of http://git.mydig.net/Sagoo-Cloud/sagoo-admin-ui

.env.development

@@ -4,3 +4,5 @@ ENV = 'development'
 # 本地环境接口地址
 VITE_API_URL = 'http://101.200.198.249:8899/api/v1'
 VITE_IMG_URL = 'http://101.200.198.249:8899/'
+# VITE_API_URL = 'http://sgadserver.wdeveloperw.xyz/api/v1'
+# VITE_IMG_URL = 'http://sgadserver.wdeveloperw.xyz/'

src/api/system/index.ts

@@ -96,17 +96,28 @@ export default {
   getSysInfo: () => get('/system/monitor/server'),
   log: {
     getList: (params: object) => get('/system/login/log/list', params),
-    del: (infoId: number) => del('/system/login/log/del', { infoId }),
+    del: (infoIds: number) => del('/system/login/log/del', { infoIds }),
     detail: (infoId: number) => get('/system/login/log/detail', { infoId }),
     clearLog: () => post('/system/login/log/clear'),
   },
+  oper: {
+    getList: (params: object) => get('/system/oper/log/list', params),
+    del: (operIds: number) => del('/system/oper/log/del', { operIds }),
+    detail: (operId: number) => get('/system/oper/log/detail', { operId }),
+    clearLog: () => post('/system/oper/log/clear'),
+  },
+  online: {
+    getList: (params: object) => get('/system/userOnline/list', params),
+    strongBack: (id: number) => del('/system/userOnline/strongBack', { id }),
+  },
   task: {
-    getList: (params: object) => get('system/job/list', params),
-    add: (data: object) => post('system/job/add', data),
-    edit: (data: object) => put('system/job//edit', data),
-    del: (id: number) => del('system/job/delJobById', { id }),
-    detail: (id: number) => get('system/job/getJobById', { id }),
-    run: (id: number) => get('system/job/run', { id }),
-    // clearLog: () => post('/system/login/log/clear'),
+    getList: (params: object) => get('/system/job/list', params),
+    add: (data: object) => post('/system/job/add', data),
+    edit: (data: object) => put('/system/job//edit', data),
+    del: (id: number) => del('/system/job/delJobById', { id }),
+    detail: (id: number) => get('/system/job/getJobById', { id }),
+    run: (id: number) => put('/system/job/run', { id }),
+    start: (id: number) => put('/system/job/start', { id }),
+    stop: (id: number) => put('/system/job/stop', { id })
   }
 }

src/views/system/monitor/online/index.vue

@@ -0,0 +1,146 @@
+<template>
+  <div class="system-dic-container">
+    <el-card shadow="hover">
+      <div class="system-user-search mb15" v-if="false">
+        <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
+          <!-- <el-form-item label="登录IP" prop="ipaddr">
+            <el-input v-model="tableData.param.ipaddr" placeholder="请输入登录地址" clearable style="width: 180px;" size="default" @keyup.enter.native="dataList" />
+          </el-form-item>
+
+          <el-form-item label="用户名称" prop="loginLocation">
+            <el-input v-model="tableData.param.loginLocation" placeholder="请输入登录地点" clearable style="width: 180px;" size="default" @keyup.enter.native="dataList" />
+          </el-form-item> -->
+					
+          <el-form-item label="登录时间" prop="dateRange">
+            <el-date-picker v-model="tableData.param.dateRange" size="default" style="width: 240px" value-format="YYYY-MM-DD" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button size="default" type="primary" class="ml10" @click="dataList">
+              <el-icon>
+                <ele-Search />
+              </el-icon>
+              查询
+            </el-button>
+            <el-button size="default" @click="resetQuery(queryRef)">
+              <el-icon>
+                <ele-Refresh />
+              </el-icon>
+              重置
+            </el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="编号" align="center" width="60" prop="id" />
+        <el-table-column label="用户名" align="center" prop="userName" />
+        <el-table-column label="token" align="center" prop="token" :show-overflow-tooltip="true" />
+        <el-table-column label="登录地址" align="center" prop="ip"  :show-overflow-tooltip="true" />
+        <el-table-column label="登录时间" align="createdAt" prop="createdAt"  :show-overflow-tooltip="true" />
+        <el-table-column label="浏览器" align="center" prop="explorer" />
+        <el-table-column label="操作系统" show-overflow-tooltip align="center" prop="os" />
+					
+				<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+					<template #default="scope">
+						<el-button
+							size="mini"
+							type="text"
+							@click="handleForceLogout(scope.row)"
+						>强退</el-button>
+					</template>
+				</el-table-column>
+      </el-table>
+      <pagination v-show="tableData.total>0" :total="tableData.total" v-model:page="tableData.param.pageNum" v-model:limit="tableData.param.pageSize" @pagination="dataList" />
+    </el-card>
+  </div>
+</template>
+
+<script lang="ts">
+import { toRefs, reactive, onMounted, ref, defineComponent, getCurrentInstance } from 'vue';
+import { ElMessageBox, ElMessage, FormInstance } from 'element-plus';
+import api from '/@/api/system';
+
+// 定义接口来定义对象的类型
+interface TableDataRow {
+	id: number;
+	userName: string;
+	token: string;
+	ip: string;
+	createdAt: string;
+	explorer: string;
+	os: string;
+}
+interface TableDataState {
+	tableData: {
+		data: Array<TableDataRow>;
+		total: number;
+		loading: boolean;
+		param: {
+			pageNum: number;
+			pageSize: number;
+			dateRange: string[];
+		};
+	};
+}
+
+export default defineComponent({
+	name: 'online',
+	setup() {
+		const queryRef = ref();
+		const state = reactive<TableDataState>({
+			tableData: {
+				data: [],
+				total: 0,
+				loading: false,
+				param: {
+					pageNum: 1,
+					pageSize: 10,
+					dateRange: []
+				},
+			},
+		});
+		// 初始化表格数据
+		const initTableData = () => {
+			dataList();
+		};
+		const dataList = () => {
+			api.online.getList(state.tableData.param).then((res: any) => {
+				state.tableData.data = res.list;
+				state.tableData.total = res.total;
+			});
+		};
+		const handleForceLogout = (row: TableDataRow) => {
+			ElMessageBox.confirm('你确定要强制退出所选数据？', '提示', {
+				confirmButtonText: '确认',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(() => {
+					api.online.strongBack(row.id).then(() => {
+						ElMessage.success('清除成功');
+						dataList();
+					});
+				})
+				.catch(() => {});
+		}
+		// 页面加载时
+		onMounted(() => {
+			initTableData();
+		});
+		/** 重置按钮操作 */
+		const resetQuery = (formEl: FormInstance | undefined) => {
+			if (!formEl) return;
+			formEl.resetFields();
+			dataList();
+		};
+		return {
+			queryRef,
+			dataList,
+			resetQuery,
+			handleForceLogout,
+			...toRefs(state),
+		};
+	},
+});
+</script>

src/views/system/monitor/operLog/index.vue

@@ -0,0 +1,281 @@
+<template>
+  <div class="system-dic-container">
+    <el-card shadow="hover">
+      <div class="system-user-search mb15">
+        <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
+          <el-form-item label="系统模块" prop="title">
+            <el-input v-model="tableData.param.title" placeholder="请输入系统模块" clearable style="width: 180px;" size="default" @keyup.enter="dataList" />
+          </el-form-item>
+
+          <el-form-item label="操作人员" prop="operName">
+            <el-input v-model="tableData.param.operName" placeholder="请输入操作人员" clearable style="width: 180px;" size="default" @keyup.enter="dataList" />
+          </el-form-item>
+
+          <el-form-item label="业务类型" prop="businessType">
+            <el-select v-model="tableData.param.businessType" placeholder="请选择类型" clearable size="default" style="width: 180px">
+              <el-option label="新增" :value="1" />
+              <el-option label="修改" :value="2" />
+              <el-option label="删除" :value="3" />
+              <el-option label="其它" :value="0" />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="状态" prop="status">
+            <el-select v-model="tableData.param.status" placeholder="请选择状态" clearable size="default" style="width: 180px">
+              <el-option label="全部" :value="-1" />
+              <el-option label="正常" :value="0" />
+              <el-option label="停用" :value="1" />
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button size="default" type="primary" class="ml10" @click="dataList">
+              <el-icon>
+                <ele-Search />
+              </el-icon>
+              查询
+            </el-button>
+            <el-button size="default" @click="resetQuery(queryRef)">
+              <el-icon>
+                <ele-Refresh />
+              </el-icon>
+              重置
+            </el-button>
+            <el-button size="default" type="danger" class="ml10" @click="onRowDel(null)">
+              <el-icon>
+                <ele-Delete />
+              </el-icon>
+              删除日志
+            </el-button>
+            <!-- <el-button size="default" type="danger" class="ml10" @click="onRowClear()">
+              <el-icon>
+                <ele-Delete />
+              </el-icon>
+              清空日志
+            </el-button> -->
+          </el-form-item>
+        </el-form>
+      </div>
+      <el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="编号" align="center" width="60" prop="operId" />
+        <el-table-column label="系统模块" align="center" prop="title" />
+        <el-table-column label="业务类型" align="center" prop="businessType" width="130">
+          <template #default="scope">
+            <span size="small" v-if="scope.row.businessType === 0">其他</span>
+            <span size="small" v-else-if="scope.row.businessType === 1">新增</span>
+            <span size="small" v-else-if="scope.row.businessType === 2">修改</span>
+            <span size="small" v-else-if="scope.row.businessType === 3">删除</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作类型" align="center" prop="operatorType" width="130">
+          <template #default="scope">
+            <span size="small" v-if="scope.row.operatorType === 0">其他</span>
+            <span size="small" v-else-if="scope.row.operatorType === 1">后台用户</span>
+            <span size="small" v-else-if="scope.row.operatorType === 2">手机端用户</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作人员" align="center" prop="operName" :show-overflow-tooltip="true" />
+        <el-table-column label="部门名称" align="center" prop="deptName" />
+        <el-table-column label="主机" show-overflow-tooltip align="center" prop="operIp" />
+        <el-table-column label="操作地点" show-overflow-tooltip align="center" prop="operLocation" />
+        <el-table-column label="操作状态" align="center" prop="status" width="90">
+          <template #default="scope">
+            <el-tag type="info" size="small" v-if="scope.row.status === 1">停用</el-tag>
+            <el-tag type="success" size="small" v-else-if="scope.row.status === 0">正常</el-tag>
+            <el-tag type="info" size="small" v-else-if="scope.row.status === -1">全部</el-tag>
+            <el-tag type="info" size="small" v-else>-</el-tag>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="操作信息" show-overflow-tooltip prop="msg" /> -->
+        <el-table-column label="操作" width="160" align="center" fixed="right">
+          <template #default="scope">
+            <el-button size="small" type="text" @click="onOpenDetail(scope.row)">详细</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination v-show="tableData.total>0" :total="tableData.total" v-model:page="tableData.param.pageNum" v-model:limit="tableData.param.pageSize" @pagination="dataList" />
+    </el-card>
+		
+    <el-dialog :title="currentRow.title + '详情'" v-model="dialogVisible" width="550px">
+      <el-form :model="currentRow" ref="formRef" size="default" label-width="90px">
+        <el-form-item label="模块标题" prop="title">
+          {{ currentRow.title }}
+        </el-form-item>
+        <el-form-item label="请求方式" prop="title">
+          {{ currentRow.requestMethod }}
+        </el-form-item>
+        <el-form-item label="方法名称" prop="title">
+          {{ currentRow.method }}
+        </el-form-item>
+        <el-form-item label="操作地点" prop="title">
+          {{ currentRow.operLocation }}
+        </el-form-item>
+        <el-form-item label="请求参数" prop="title">
+          {{ currentRow.operParam }}
+        </el-form-item>
+        <el-form-item label="返回参数" prop="title">
+          {{ currentRow.jsonResult }}
+        </el-form-item>
+        <el-form-item label="操作状态" prop="title">
+          {{ currentRow.status === 0 ? '正常' : '异常' }}
+        </el-form-item>
+        <el-form-item label="操作时间" prop="title">
+          {{ currentRow.operTime }}
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="dialogVisible = false" size="default">关 闭</el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script lang="ts">
+import { toRefs, reactive, onMounted, ref, defineComponent, getCurrentInstance } from 'vue';
+import { ElMessageBox, ElMessage, FormInstance } from 'element-plus';
+import api from '/@/api/system';
+
+// 定义接口来定义对象的类型
+interface TableDataRow {
+	operId: number;
+	loginName: string;
+	ipaddr: string;
+	loginLocation: string;
+	browser: string;
+	os: string;
+	status: number;
+	msg: string;
+	loginTime: string;
+	module: string;
+}
+interface TableDataState {
+	ids: number[];
+	tableData: {
+		data: Array<TableDataRow>;
+		total: number;
+		loading: boolean;
+		param: {
+			pageNum: number;
+			pageSize: number;
+			dateRange: string[];
+			operName: number | string;
+			businessType: number | string;
+			status: number | string;
+			title: string;
+		};
+	};
+}
+
+export default defineComponent({
+	name: 'apiV1SystemLoginLogList',
+	setup() {
+		const { proxy } = getCurrentInstance() as any;
+		const queryRef = ref();
+		const { admin_login_status } = proxy.useDict('admin_login_status');
+		const state = reactive<TableDataState>({
+			ids: [],
+			tableData: {
+				data: [],
+				total: 0,
+				loading: false,
+				param: {
+					pageNum: 1,
+					pageSize: 10,
+					dateRange: [],
+					operName: '',
+					businessType: '',
+					status: '',
+					title: ''
+				},
+			},
+		});
+		const dialogVisible = ref(false)
+		const currentRow = ref({})
+		// 初始化表格数据
+		const initTableData = () => {
+			dataList();
+		};
+		const dataList = () => {
+			api.oper.getList(state.tableData.param).then((res: any) => {
+				state.tableData.data = res.list;
+				state.tableData.total = res.total;
+			});
+		};
+		// 删除日志
+		const onRowDel = (row: TableDataRow) => {
+			let msg = '你确定要删除所选数据？';
+			let ids: number[] = [];
+			if (row) {
+				msg = `此操作将永久删除：“${row.loginName}”，是否继续?`;
+				ids = [row.operId];
+			} else {
+				ids = state.ids;
+			}
+			if (ids.length === 0) {
+				ElMessage.error('请选择要删除的数据。');
+				return;
+			}
+			ElMessageBox.confirm(msg, '提示', {
+				confirmButtonText: '确认',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(() => {
+					api.oper.del(ids).then(() => {
+						ElMessage.success('删除成功');
+						dataList();
+					});
+				})
+				.catch(() => {});
+		};
+		// 清空日志
+		// const onRowClear = () => {
+		// 	ElMessageBox.confirm('你确定要删除所选数据？', '提示', {
+		// 		confirmButtonText: '确认',
+		// 		cancelButtonText: '取消',
+		// 		type: 'warning',
+		// 	})
+		// 		.then(() => {
+		// 			api.oper.clearLog().then(() => {
+		// 				ElMessage.success('清除成功');
+		// 				dataList();
+		// 			});
+		// 		})
+		// 		.catch(() => {});
+		// };
+		const onOpenDetail = (row: TableDataRow) => {
+			dialogVisible.value = true
+			currentRow.value = row
+		}
+		// 页面加载时
+		onMounted(() => {
+			initTableData();
+		});
+		/** 重置按钮操作 */
+		const resetQuery = (formEl: FormInstance | undefined) => {
+			if (!formEl) return;
+			formEl.resetFields();
+			dataList();
+		};
+		// 多选框选中数据
+		const handleSelectionChange = (selection: TableDataRow[]) => {
+			state.ids = selection.map((item) => item.operId);
+		};
+		return {
+			queryRef,
+			onRowDel,
+			onOpenDetail,
+			dataList,
+			resetQuery,
+			handleSelectionChange,
+			// onRowClear,
+			dialogVisible,
+			currentRow,
+			admin_login_status,
+			...toRefs(state),
+		};
+	},
+});
+</script>

src/views/system/task/index.vue

@@ -59,11 +59,13 @@
         <el-table-column label="任务方法名" prop="invokeTarget" />
         <el-table-column label="cron执行表达式" prop="cronExpression" />
         <el-table-column label="状态" align="center" prop="status" width="100">
-          <template #default="{ row }">
-            {{ row.status ? '正常' : '暂停' }}
+          <template #default="scope">
+            <!-- {{ row.status ? '正常' : '暂停' }} -->
+						<el-switch v-model="scope.row.status" inline-prompt :active-value="0" :inactive-value="1" active-text="启" inactive-text="禁" @change="handleStatusChange(scope.row)">
+						</el-switch>
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="100" align="center" fixed="right">
+        <el-table-column label="操作" width="180" align="center" fixed="right">
           <template #default="scope">
             <el-button size="small" text type="warning" @click="onOpenEditDic(scope.row)">修改</el-button>
             <el-button size="small" text type="danger" @click="onRowDel(scope.row)">删除</el-button>
@@ -191,6 +193,27 @@ export default defineComponent({
 				});
 			});
 		}
+		const handleStatusChange = (row: TableDataRow) => {
+			let text = row.status === 0 ? '启用' : '停用';
+			ElMessageBox.confirm('确认要"' + text + '"："' + row.jobName + '"任务吗?', '警告', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(function () {
+					if (row.status === 0) {
+						return api.task.start(row.jobId)
+					} else {
+						return api.task.stop(row.jobId)
+					}
+				})
+				.then(() => {
+					ElMessage.success(text + '成功');
+				})
+				.catch(function () {
+					row.status = row.status === 0 ? 1 : 0;
+				});
+		}
 		// 页面加载时
 		onMounted(() => {
 			initTableData();
@@ -219,6 +242,7 @@ export default defineComponent({
 			onOpenEditDic,
 			onRowDel,
 			onRowRun,
+			handleStatusChange,
 			dataList,
 			resetQuery,
 			handleSelectionChange,