From fc3d463ad190220124a0134f5b0dd60a1b89ca50 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 07 三月 2025 10:19:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/resourceDemand/standardMaterailRequistion/index.vue | 24 ++-
/dev/null | 295 -------------------------------------------------
src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue | 10 +
src/router/index.js | 14 --
4 files changed, 21 insertions(+), 322 deletions(-)
diff --git a/src/api/monitor/job.js b/src/api/monitor/job.js
deleted file mode 100644
index 3815569..0000000
--- a/src/api/monitor/job.js
+++ /dev/null
@@ -1,71 +0,0 @@
-import request from '@/utils/request'
-
-// 鏌ヨ瀹氭椂浠诲姟璋冨害鍒楄〃
-export function listJob(query) {
- return request({
- url: '/monitor/job/list',
- method: 'get',
- params: query
- })
-}
-
-// 鏌ヨ瀹氭椂浠诲姟璋冨害璇︾粏
-export function getJob(jobId) {
- return request({
- url: '/monitor/job/' + jobId,
- method: 'get'
- })
-}
-
-// 鏂板瀹氭椂浠诲姟璋冨害
-export function addJob(data) {
- return request({
- url: '/monitor/job',
- method: 'post',
- data: data
- })
-}
-
-// 淇敼瀹氭椂浠诲姟璋冨害
-export function updateJob(data) {
- return request({
- url: '/monitor/job',
- method: 'put',
- data: data
- })
-}
-
-// 鍒犻櫎瀹氭椂浠诲姟璋冨害
-export function delJob(jobId) {
- return request({
- url: '/monitor/job/' + jobId,
- method: 'delete'
- })
-}
-
-// 浠诲姟鐘舵�佷慨鏀�
-export function changeJobStatus(jobId, status) {
- const data = {
- jobId,
- status
- }
- return request({
- url: '/monitor/job/changeStatus',
- method: 'put',
- data: data
- })
-}
-
-
-// 瀹氭椂浠诲姟绔嬪嵆鎵ц涓�娆�
-export function runJob(jobId, jobGroup) {
- const data = {
- jobId,
- jobGroup
- }
- return request({
- url: '/monitor/job/run',
- method: 'put',
- data: data
- })
-}
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index a9811bb..47f9884 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -205,20 +205,6 @@
hidden: true,
permissions: ["customer:edit"],
},
- {
- path: "/monitor/job-log",
- component: Layout,
- hidden: true,
- permissions: ["monitor:job:list"],
- children: [
- {
- path: "index/:jobId(\\d+)",
- component: () => import("@/views/monitor/job/log"),
- name: "JobLog",
- meta: { title: "璋冨害鏃ュ織", activeMenu: "/monitor/job" },
- },
- ],
- },
];
// 闃叉杩炵画鐐瑰嚮澶氭璺敱鎶ラ敊
diff --git a/src/views/CNAS/resourceDemand/standardMaterailRequistion/index.vue b/src/views/CNAS/resourceDemand/standardMaterailRequistion/index.vue
index 9d91405..dd59ccd 100644
--- a/src/views/CNAS/resourceDemand/standardMaterailRequistion/index.vue
+++ b/src/views/CNAS/resourceDemand/standardMaterailRequistion/index.vue
@@ -5,14 +5,14 @@
<el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
<el-form-item label="鏍囧噯鐗╄川鍚嶇О" prop="name">
<el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="searchForm.name"
- @keyup.enter.native="searchList"></el-input>
+ @keyup.enter.native="searchList"></el-input>
</el-form-item>
- <el-form-item label="瑙勬牸鍨嬪彿" prop="factoryManufacturer">
+ <el-form-item label="瑙勬牸鍨嬪彿" prop="model">
<el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="searchForm.model"
- @keyup.enter.native="searchList"></el-input>
+ @keyup.enter.native="searchList"></el-input>
</el-form-item>
<el-form-item>
- <el-button size="medium" @click="resetSearchForm">閲� 缃�</el-button>
+ <el-button size="medium" @click="resetSearchForm">閲� 缃�</el-button>
<el-button size="medium" type="primary" @click="searchList">鏌� 璇�</el-button>
</el-form-item>
</el-form>
@@ -20,7 +20,7 @@
</div>
<div class="table">
<lims-table :tableData="tableData" :column="tableColumn" :height="'calc(100vh - 250px)'" @pagination="pagination"
- :page="page" :tableLoading="tableLoading"></lims-table>
+ :page="page" :tableLoading="tableLoading"></lims-table>
</div>
</div>
</template>
@@ -41,7 +41,7 @@
return {
searchForm: {
name: '',
- factoryManufacturer: '',
+ model: '',
},
tableColumn: [
{
@@ -106,16 +106,16 @@
mounted() {
this.searchList()
},
- methods :{
+ methods: {
// 鏌ヨ鍒楄〃
- searchList () {
+ searchList() {
this.tableLoading = true
getPageSubstanceRecord({
...this.page,
...this.searchForm
}).then(res => {
this.tableLoading = false
- if (res.code === 200){
+ if (res.code === 200) {
this.tableData = res.data.records
this.page.total = res.data.total
}
@@ -124,7 +124,7 @@
})
},
// 閲嶇疆鏌ヨ鏉′欢
- resetSearchForm () {
+ resetSearchForm() {
this.searchForm.name = '';
this.searchForm.model = '';
this.searchList()
@@ -138,6 +138,10 @@
}
</script>
<style scoped>
+.capacity-scope {
+ padding: 20px !important;
+}
+
.search {
height: 46px;
display: flex;
diff --git a/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue b/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue
index 7d4585a..80106ab 100644
--- a/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue
+++ b/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue
@@ -4,7 +4,7 @@
<div>
<el-form :model="form" ref="form" size="small" :inline="true">
<el-form-item label="鐗╄川鍚嶇О">
- <el-input v-model="form.search"></el-input>
+ <el-input v-model="form.name"></el-input>
</el-form-item>
<el-form-item>
<el-button @click="reset">閲� 缃�</el-button>
@@ -43,7 +43,7 @@
data() {
return {
form: {
- search: undefined
+ name: undefined
},
addRecordRef: false,
columns: [
@@ -135,7 +135,7 @@
})
},
reset() {
- this.form.search = undefined
+ this.form.name = undefined
this.getTableData()
},
async exportExcel() {
@@ -154,6 +154,10 @@
</script>
<style scoped>
+.capacity-scope {
+ padding: 20px !important;
+}
+
.search {
height: 46px;
display: flex;
diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue
deleted file mode 100644
index d13394c..0000000
--- a/src/views/monitor/job/index.vue
+++ /dev/null
@@ -1,513 +0,0 @@
-<template>
- <div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
- <el-form-item label="浠诲姟鍚嶇О" prop="jobName">
- <el-input
- v-model="queryParams.jobName"
- placeholder="璇疯緭鍏ヤ换鍔″悕绉�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="浠诲姟缁勫悕" prop="jobGroup">
- <el-select v-model="queryParams.jobGroup" placeholder="璇烽�夋嫨浠诲姟缁勫悕" clearable>
- <el-option
- v-for="dict in dict.type.sys_job_group"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="浠诲姟鐘舵��" prop="status">
- <el-select v-model="queryParams.status" placeholder="璇烽�夋嫨浠诲姟鐘舵��" clearable>
- <el-option
- v-for="dict in dict.type.sys_job_status"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鏌� 璇�</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
- </el-form-item>
- </el-form>
-
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['monitor:job:add']"
- >鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleUpdate"
- v-hasPermi="['monitor:job:edit']"
- >淇敼</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['monitor:job:remove']"
- >鍒犻櫎</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-download"
- size="mini"
- @click="handleExport"
- v-hasPermi="['monitor:job:export']"
- >瀵煎嚭</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="info"
- plain
- icon="el-icon-s-operation"
- size="mini"
- @click="handleJobLog"
- v-hasPermi="['monitor:job:query']"
- >鏃ュ織</el-button>
- </el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
-
- <el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="浠诲姟缂栧彿" width="100" align="center" prop="jobId" />
- <el-table-column label="浠诲姟鍚嶇О" align="center" prop="jobName" :show-overflow-tooltip="true" />
- <el-table-column label="浠诲姟缁勫悕" align="center" prop="jobGroup">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.sys_job_group" :value="scope.row.jobGroup"/>
- </template>
- </el-table-column>
- <el-table-column label="璋冪敤鐩爣瀛楃涓�" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
- <el-table-column label="cron鎵ц琛ㄨ揪寮�" align="center" prop="cronExpression" :show-overflow-tooltip="true" />
- <el-table-column label="鐘舵��" align="center">
- <template slot-scope="scope">
- <el-switch
- v-model="scope.row.status"
- active-value="0"
- inactive-value="1"
- @change="handleStatusChange(scope.row)"
- ></el-switch>
- </template>
- </el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['monitor:job:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['monitor:job:remove']"
- >鍒犻櫎</el-button>
- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['monitor:job:changeStatus', 'monitor:job:query']">
- <el-button size="mini" type="text" icon="el-icon-d-arrow-right">鏇村</el-button>
- <el-dropdown-menu slot="dropdown">
- <el-dropdown-item command="handleRun" icon="el-icon-caret-right"
- v-hasPermi="['monitor:job:changeStatus']">鎵ц涓�娆�</el-dropdown-item>
- <el-dropdown-item command="handleView" icon="el-icon-view"
- v-hasPermi="['monitor:job:query']">浠诲姟璇︾粏</el-dropdown-item>
- <el-dropdown-item command="handleJobLog" icon="el-icon-s-operation"
- v-hasPermi="['monitor:job:query']">璋冨害鏃ュ織</el-dropdown-item>
- </el-dropdown-menu>
- </el-dropdown>
- </template>
- </el-table-column>
- </el-table>
-
- <pagination
- v-show="total>0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
-
- <!-- 娣诲姞鎴栦慨鏀瑰畾鏃朵换鍔″璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="120px">
- <el-row>
- <el-col :span="12">
- <el-form-item label="浠诲姟鍚嶇О" prop="jobName">
- <el-input v-model="form.jobName" placeholder="璇疯緭鍏ヤ换鍔″悕绉�" />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="浠诲姟鍒嗙粍" prop="jobGroup">
- <el-select v-model="form.jobGroup" placeholder="璇烽�夋嫨浠诲姟鍒嗙粍">
- <el-option
- v-for="dict in dict.type.sys_job_group"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item prop="invokeTarget">
- <span slot="label">
- 璋冪敤鏂规硶
- <el-tooltip placement="top">
- <div slot="content">
- Bean璋冪敤绀轰緥锛歳yTask.ryParams('ry')
- <br />Class绫昏皟鐢ㄧず渚嬶細com.ruoyi.quartz.task.RyTask.ryParams('ry')
- <br />鍙傛暟璇存槑锛氭敮鎸佸瓧绗︿覆锛屽竷灏旂被鍨嬶紝闀挎暣鍨嬶紝娴偣鍨嬶紝鏁村瀷
- </div>
- <i class="el-icon-question"></i>
- </el-tooltip>
- </span>
- <el-input v-model="form.invokeTarget" placeholder="璇疯緭鍏ヨ皟鐢ㄧ洰鏍囧瓧绗︿覆" />
- </el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="cron琛ㄨ揪寮�" prop="cronExpression">
- <el-input v-model="form.cronExpression" placeholder="璇疯緭鍏ron鎵ц琛ㄨ揪寮�">
- <template slot="append">
- <el-button type="primary" @click="handleShowCron">
- 鐢熸垚琛ㄨ揪寮�
- <i class="el-icon-time el-icon--right"></i>
- </el-button>
- </template>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="24" v-if="form.jobId !== undefined">
- <el-form-item label="鐘舵��">
- <el-radio-group v-model="form.status">
- <el-radio
- v-for="dict in dict.type.sys_job_status"
- :key="dict.value"
- :label="dict.value"
- >{{dict.label}}</el-radio>
- </el-radio-group>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鎵ц绛栫暐" prop="misfirePolicy">
- <el-radio-group v-model="form.misfirePolicy" size="small">
- <el-radio-button label="1">绔嬪嵆鎵ц</el-radio-button>
- <el-radio-button label="2">鎵ц涓�娆�</el-radio-button>
- <el-radio-button label="3">鏀惧純鎵ц</el-radio-button>
- </el-radio-group>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鏄惁骞跺彂" prop="concurrent">
- <el-radio-group v-model="form.concurrent" size="small">
- <el-radio-button label="0">鍏佽</el-radio-button>
- <el-radio-button label="1">绂佹</el-radio-button>
- </el-radio-group>
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </el-dialog>
-
- <el-dialog title="Cron琛ㄨ揪寮忕敓鎴愬櫒" :visible.sync="openCron" append-to-body destroy-on-close class="scrollbar">
- <crontab @hide="openCron=false" @fill="crontabFill" :expression="expression"></crontab>
- </el-dialog>
-
- <!-- 浠诲姟鏃ュ織璇︾粏 -->
- <el-dialog title="浠诲姟璇︾粏" :visible.sync="openView" width="700px" append-to-body>
- <el-form ref="form" :model="form" label-width="120px" size="mini">
- <el-row>
- <el-col :span="12">
- <el-form-item label="浠诲姟缂栧彿锛�">{{ form.jobId }}</el-form-item>
- <el-form-item label="浠诲姟鍚嶇О锛�">{{ form.jobName }}</el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="浠诲姟鍒嗙粍锛�">{{ jobGroupFormat(form) }}</el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿锛�">{{ form.createTime }}</el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="cron琛ㄨ揪寮忥細">{{ form.cronExpression }}</el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="涓嬫鎵ц鏃堕棿锛�">{{ parseTime(form.nextValidTime) }}</el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="璋冪敤鐩爣鏂规硶锛�">{{ form.invokeTarget }}</el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="浠诲姟鐘舵�侊細">
- <div v-if="form.status == 0">姝ｅ父</div>
- <div v-else-if="form.status == 1">鏆傚仠</div>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鏄惁骞跺彂锛�">
- <div v-if="form.concurrent == 0">鍏佽</div>
- <div v-else-if="form.concurrent == 1">绂佹</div>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鎵ц绛栫暐锛�">
- <div v-if="form.misfirePolicy == 0">榛樿绛栫暐</div>
- <div v-else-if="form.misfirePolicy == 1">绔嬪嵆鎵ц</div>
- <div v-else-if="form.misfirePolicy == 2">鎵ц涓�娆�</div>
- <div v-else-if="form.misfirePolicy == 3">鏀惧純鎵ц</div>
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button @click="openView = false">鍏� 闂�</el-button>
- </div>
- </el-dialog>
- </div>
-</template>
-
-<script>
-import { listJob, getJob, delJob, addJob, updateJob, runJob, changeJobStatus } from "@/api/monitor/job";
-import Crontab from '@/components/Crontab'
-
-export default {
- components: { Crontab },
- name: "Job",
- dicts: ['sys_job_group', 'sys_job_status'],
- data() {
- return {
- // 閬僵灞�
- loading: true,
- // 閫変腑鏁扮粍
- ids: [],
- // 闈炲崟涓鐢�
- single: true,
- // 闈炲涓鐢�
- multiple: true,
- // 鏄剧ず鎼滅储鏉′欢
- showSearch: true,
- // 鎬绘潯鏁�
- total: 0,
- // 瀹氭椂浠诲姟琛ㄦ牸鏁版嵁
- jobList: [],
- // 寮瑰嚭灞傛爣棰�
- title: "",
- // 鏄惁鏄剧ず寮瑰嚭灞�
- open: false,
- // 鏄惁鏄剧ず璇︾粏寮瑰嚭灞�
- openView: false,
- // 鏄惁鏄剧ずCron琛ㄨ揪寮忓脊鍑哄眰
- openCron: false,
- // 浼犲叆鐨勮〃杈惧紡
- expression: "",
- // 鏌ヨ鍙傛暟
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- jobName: undefined,
- jobGroup: undefined,
- status: undefined
- },
- // 琛ㄥ崟鍙傛暟
- form: {},
- // 琛ㄥ崟鏍￠獙
- rules: {
- jobName: [
- { required: true, message: "浠诲姟鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
- ],
- invokeTarget: [
- { required: true, message: "璋冪敤鐩爣瀛楃涓蹭笉鑳戒负绌�", trigger: "blur" }
- ],
- cronExpression: [
- { required: true, message: "cron鎵ц琛ㄨ揪寮忎笉鑳戒负绌�", trigger: "blur" }
- ]
- }
- };
- },
- created() {
- this.getList();
- },
- methods: {
- /** 鏌ヨ瀹氭椂浠诲姟鍒楄〃 */
- getList() {
- this.loading = true;
- listJob(this.queryParams).then(response => {
- this.jobList = response.rows;
- this.total = response.total;
- this.loading = false;
- });
- },
- // 浠诲姟缁勫悕瀛楀吀缈昏瘧
- jobGroupFormat(row, column) {
- return this.selectDictLabel(this.dict.type.sys_job_group, row.jobGroup);
- },
- // 鍙栨秷鎸夐挳
- cancel() {
- this.open = false;
- this.reset();
- },
- // 琛ㄥ崟閲嶇疆
- reset() {
- this.form = {
- jobId: undefined,
- jobName: undefined,
- jobGroup: undefined,
- invokeTarget: undefined,
- cronExpression: undefined,
- misfirePolicy: 1,
- concurrent: 1,
- status: "0"
- };
- this.resetForm("form");
- },
- /** 鎼滅储鎸夐挳鎿嶄綔 */
- handleQuery() {
- this.queryParams.pageNum = 1;
- this.getList();
- },
- /** 閲嶇疆鎸夐挳鎿嶄綔 */
- resetQuery() {
- this.resetForm("queryForm");
- this.handleQuery();
- },
- // 澶氶�夋閫変腑鏁版嵁
- handleSelectionChange(selection) {
- this.ids = selection.map(item => item.jobId);
- this.single = selection.length != 1;
- this.multiple = !selection.length;
- },
- // 鏇村鎿嶄綔瑙﹀彂
- handleCommand(command, row) {
- switch (command) {
- case "handleRun":
- this.handleRun(row);
- break;
- case "handleView":
- this.handleView(row);
- break;
- case "handleJobLog":
- this.handleJobLog(row);
- break;
- default:
- break;
- }
- },
- // 浠诲姟鐘舵�佷慨鏀�
- handleStatusChange(row) {
- let text = row.status === "0" ? "鍚敤" : "鍋滅敤";
- this.$modal.confirm('纭瑕�"' + text + '""' + row.jobName + '"浠诲姟鍚楋紵').then(function() {
- return changeJobStatus(row.jobId, row.status);
- }).then(() => {
- this.$modal.msgSuccess(text + "鎴愬姛");
- }).catch(function() {
- row.status = row.status === "0" ? "1" : "0";
- });
- },
- /* 绔嬪嵆鎵ц涓�娆� */
- handleRun(row) {
- this.$modal.confirm('纭瑕佺珛鍗虫墽琛屼竴娆�"' + row.jobName + '"浠诲姟鍚楋紵').then(function() {
- return runJob(row.jobId, row.jobGroup);
- }).then(() => {
- this.$modal.msgSuccess("鎵ц鎴愬姛");
- }).catch(() => {});
- },
- /** 浠诲姟璇︾粏淇℃伅 */
- handleView(row) {
- getJob(row.jobId).then(response => {
- this.form = response.data;
- this.openView = true;
- });
- },
- /** cron琛ㄨ揪寮忔寜閽搷浣� */
- handleShowCron() {
- this.expression = this.form.cronExpression;
- this.openCron = true;
- },
- /** 纭畾鍚庡洖浼犲�� */
- crontabFill(value) {
- this.form.cronExpression = value;
- },
- /** 浠诲姟鏃ュ織鍒楄〃鏌ヨ */
- handleJobLog(row) {
- const jobId = row.jobId || 0;
- this.$router.push('/monitor/job-log/index/' + jobId)
- },
- /** 鏂板鎸夐挳鎿嶄綔 */
- handleAdd() {
- this.reset();
- this.open = true;
- this.title = "娣诲姞浠诲姟";
- },
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
- this.reset();
- const jobId = row.jobId || this.ids;
- getJob(jobId).then(response => {
- this.form = response.data;
- this.open = true;
- this.title = "淇敼浠诲姟";
- });
- },
- /** 鎻愪氦鎸夐挳 */
- submitForm: function() {
- this.$refs["form"].validate(valid => {
- if (valid) {
- if (this.form.jobId != undefined) {
- updateJob(this.form).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
- this.getList();
- });
- } else {
- addJob(this.form).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.getList();
- });
- }
- }
- });
- },
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
- const jobIds = row.jobId || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎瀹氭椂浠诲姟缂栧彿涓�"' + jobIds + '"鐨勬暟鎹」锛�').then(function() {
- return delJob(jobIds);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
- },
- /** 瀵煎嚭鎸夐挳鎿嶄綔 */
- handleExport() {
- this.download('monitor/job/export', {
- ...this.queryParams
- }, `job_${new Date().getTime()}.xlsx`)
- }
- }
-};
-</script>
diff --git a/src/views/monitor/job/log.vue b/src/views/monitor/job/log.vue
deleted file mode 100644
index 8f044b3..0000000
--- a/src/views/monitor/job/log.vue
+++ /dev/null
@@ -1,295 +0,0 @@
-<template>
- <div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
- <el-form-item label="浠诲姟鍚嶇О" prop="jobName">
- <el-input
- v-model="queryParams.jobName"
- placeholder="璇疯緭鍏ヤ换鍔″悕绉�"
- clearable
- style="width: 240px"
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="浠诲姟缁勫悕" prop="jobGroup">
- <el-select
- v-model="queryParams.jobGroup"
- placeholder="璇烽�夋嫨浠诲姟缁勫悕"
- clearable
- style="width: 240px"
- >
- <el-option
- v-for="dict in dict.type.sys_job_group"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鎵ц鐘舵��" prop="status">
- <el-select
- v-model="queryParams.status"
- placeholder="璇烽�夋嫨鎵ц鐘舵��"
- clearable
- style="width: 240px"
- >
- <el-option
- v-for="dict in dict.type.sys_common_status"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鎵ц鏃堕棿">
- <el-date-picker
- v-model="dateRange"
- 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 type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鏌� 璇�</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
- </el-form-item>
- </el-form>
-
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['monitor:job:remove']"
- >鍒犻櫎</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- @click="handleClean"
- v-hasPermi="['monitor:job:remove']"
- >娓呯┖</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-download"
- size="mini"
- @click="handleExport"
- v-hasPermi="['monitor:job:export']"
- >瀵煎嚭</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-close"
- size="mini"
- @click="handleClose"
- >鍏抽棴</el-button>
- </el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
-
- <el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="鏃ュ織缂栧彿" width="80" align="center" prop="jobLogId" />
- <el-table-column label="浠诲姟鍚嶇О" align="center" prop="jobName" :show-overflow-tooltip="true" />
- <el-table-column label="浠诲姟缁勫悕" align="center" prop="jobGroup" :show-overflow-tooltip="true">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.sys_job_group" :value="scope.row.jobGroup"/>
- </template>
- </el-table-column>
- <el-table-column label="璋冪敤鐩爣瀛楃涓�" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
- <el-table-column label="鏃ュ織淇℃伅" align="center" prop="jobMessage" :show-overflow-tooltip="true" />
- <el-table-column label="鎵ц鐘舵��" align="center" prop="status">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.sys_common_status" :value="scope.row.status"/>
- </template>
- </el-table-column>
- <el-table-column label="鎵ц鏃堕棿" align="center" prop="createTime" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
- </template>
- </el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-view"
- @click="handleView(scope.row)"
- v-hasPermi="['monitor:job:query']"
- >璇︾粏</el-button>
- </template>
- </el-table-column>
- </el-table>
-
- <pagination
- v-show="total>0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
-
- <!-- 璋冨害鏃ュ織璇︾粏 -->
- <el-dialog title="璋冨害鏃ュ織璇︾粏" :visible.sync="open" width="700px" append-to-body>
- <el-form ref="form" :model="form" label-width="100px" size="mini">
- <el-row>
- <el-col :span="12">
- <el-form-item label="鏃ュ織搴忓彿锛�">{{ form.jobLogId }}</el-form-item>
- <el-form-item label="浠诲姟鍚嶇О锛�">{{ form.jobName }}</el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="浠诲姟鍒嗙粍锛�">{{ form.jobGroup }}</el-form-item>
- <el-form-item label="鎵ц鏃堕棿锛�">{{ form.createTime }}</el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="璋冪敤鏂规硶锛�">{{ form.invokeTarget }}</el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="鏃ュ織淇℃伅锛�">{{ form.jobMessage }}</el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="鎵ц鐘舵�侊細">
- <div v-if="form.status == 0">姝ｅ父</div>
- <div v-else-if="form.status == 1">澶辫触</div>
- </el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="寮傚父淇℃伅锛�" v-if="form.status == 1">{{ form.exceptionInfo }}</el-form-item>
- </el-col>
- </el-row>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button @click="open = false">鍏� 闂�</el-button>
- </div>
- </el-dialog>
- </div>
-</template>
-
-<script>
-import { getJob} from "@/api/monitor/job";
-import { listJobLog, delJobLog, cleanJobLog } from "@/api/monitor/jobLog";
-
-export default {
- name: "JobLog",
- dicts: ['sys_common_status', 'sys_job_group'],
- data() {
- return {
- // 閬僵灞�
- loading: true,
- // 閫変腑鏁扮粍
- ids: [],
- // 闈炲涓鐢�
- multiple: true,
- // 鏄剧ず鎼滅储鏉′欢
- showSearch: true,
- // 鎬绘潯鏁�
- total: 0,
- // 璋冨害鏃ュ織琛ㄦ牸鏁版嵁
- jobLogList: [],
- // 鏄惁鏄剧ず寮瑰嚭灞�
- open: false,
- // 鏃ユ湡鑼冨洿
- dateRange: [],
- // 琛ㄥ崟鍙傛暟
- form: {},
- // 鏌ヨ鍙傛暟
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- jobName: undefined,
- jobGroup: undefined,
- status: undefined
- }
- };
- },
- created() {
- const jobId = this.$route.params && this.$route.params.jobId;
- if (jobId !== undefined && jobId != 0) {
- getJob(jobId).then(response => {
- this.queryParams.jobName = response.data.jobName;
- this.queryParams.jobGroup = response.data.jobGroup;
- this.getList();
- });
- } else {
- this.getList();
- }
- },
- methods: {
- /** 鏌ヨ璋冨害鏃ュ織鍒楄〃 */
- getList() {
- this.loading = true;
- listJobLog(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
- this.jobLogList = response.rows;
- this.total = response.total;
- this.loading = false;
- }
- );
- },
- // 杩斿洖鎸夐挳
- handleClose() {
- const obj = { path: "/monitor/job" };
- this.$tab.closeOpenPage(obj);
- },
- /** 鎼滅储鎸夐挳鎿嶄綔 */
- handleQuery() {
- this.queryParams.pageNum = 1;
- this.getList();
- },
- /** 閲嶇疆鎸夐挳鎿嶄綔 */
- resetQuery() {
- this.dateRange = [];
- this.resetForm("queryForm");
- this.handleQuery();
- },
- // 澶氶�夋閫変腑鏁版嵁
- handleSelectionChange(selection) {
- this.ids = selection.map(item => item.jobLogId);
- this.multiple = !selection.length;
- },
- /** 璇︾粏鎸夐挳鎿嶄綔 */
- handleView(row) {
- this.open = true;
- this.form = row;
- },
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
- const jobLogIds = this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎璋冨害鏃ュ織缂栧彿涓�"' + jobLogIds + '"鐨勬暟鎹」锛�').then(function() {
- return delJobLog(jobLogIds);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
- },
- /** 娓呯┖鎸夐挳鎿嶄綔 */
- handleClean() {
- this.$modal.confirm('鏄惁纭娓呯┖鎵�鏈夎皟搴︽棩蹇楁暟鎹」锛�').then(function() {
- return cleanJobLog();
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("娓呯┖鎴愬姛");
- }).catch(() => {});
- },
- /** 瀵煎嚭鎸夐挳鎿嶄綔 */
- handleExport() {
- this.download('/monitor/jobLog/export', {
- ...this.queryParams
- }, `log_${new Date().getTime()}.xlsx`)
- }
- }
-};
-</script>
--
Gitblit v1.9.3