添加定时任务和字典

src/api/dict/data.js

+import request from '@/utils/request'
+
+// 查询字典数据列表
+export function listData(query) {
+  return request({
+    url: '/topology/dict/data/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询字典数据详细
+export function getData(dictCode) {
+  return request({
+    url: '/topology/dict/data/' + dictCode,
+    method: 'get'
+  })
+}
+
+// 根据字典类型查询字典数据信息
+export function getDicts(dictType) {
+  return request({
+    url: '/topology/dict/data/type/' + dictType,
+    method: 'get'
+  })
+}
+
+// 新增字典数据
+export function addData(data) {
+  return request({
+    url: '/topology/dict/data',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改字典数据
+export function updateData(data) {
+  return request({
+    url: '/topology/dict/data',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除字典数据
+export function delData(dictCode) {
+  return request({
+    url: '/topology/dict/data/' + dictCode,
+    method: 'delete'
+  })
+}
+
+// 导出字典数据
+export function exportData(query) {
+  return request({
+    url: '/topology/dict/data/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file

src/api/dict/type.js

+import request from '@/utils/request'
+
+// 查询字典类型列表
+export function listType(query) {
+  return request({
+    url: '/topology/dict/type/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询字典类型详细
+export function getType(dictId) {
+  return request({
+    url: '/topology/dict/type/' + dictId,
+    method: 'get'
+  })
+}
+
+// 新增字典类型
+export function addType(data) {
+  return request({
+    url: '/topology/dict/type',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改字典类型
+export function updateType(data) {
+  return request({
+    url: '/topology/dict/type',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除字典类型
+export function delType(dictId) {
+  return request({
+    url: '/topology/dict/type/' + dictId,
+    method: 'delete'
+  })
+}
+
+// 清理参数缓存
+export function clearCache() {
+  return request({
+    url: '/topology/dict/type/clearCache',
+    method: 'delete'
+  })
+}
+
+// 导出字典类型
+export function exportType(query) {
+  return request({
+    url: '/topology/dict/type/export',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获取字典选择框列表
+export function optionselect() {
+  return request({
+    url: '/topology/dict/type/optionselect',
+    method: 'get'
+  })
+}
\ No newline at end of file

src/api/job.js

+import request from '@/utils/request'
+
+// 查询定时任务调度列表
+export function listJob(query) {
+  return request({
+    url: '/topology/job/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询定时任务调度详细
+export function getJob(jobId) {
+  return request({
+    url: '/topology/job/' + jobId,
+    method: 'get'
+  })
+}
+
+// 新增定时任务调度
+export function addJob(data) {
+  return request({
+    url: '/topology/job',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改定时任务调度
+export function updateJob(data) {
+  return request({
+    url: '/topology/job',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除定时任务调度
+export function delJob(jobId) {
+  return request({
+    url: '/topology/job/' + jobId,
+    method: 'delete'
+  })
+}
+
+// 导出定时任务调度
+export function exportJob(query) {
+  return request({
+    url: '/topology/job/export',
+    method: 'get',
+    params: query
+  })
+}
+
+// 任务状态修改
+export function changeJobStatus(jobId, status) {
+  const data = {
+    jobId,
+    status
+  }
+  return request({
+    url: '/topology/job/changeStatus',
+    method: 'put',
+    data: data
+  })
+}
+
+
+// 定时任务立即执行一次
+export function runJob(jobId, jobGroup) {
+  const data = {
+    jobId,
+    jobGroup
+  }
+  return request({
+    url: '/topology/job/run',
+    method: 'put',
+    data: data
+  })
+}
\ No newline at end of file

src/main.js

@@ -3,24 +3,40 @@ import App from './App.vue'
 import router from './router'
 import store from './store'
 import ElementUI from 'element-ui'
-import locale from 'element-ui/lib/locale/lang/en'
 import './assets/styles/element-variables.scss'
 import Antd from 'ant-design-vue';
 import 'ant-design-vue/dist/antd.css';
 
-
+import { parseTime, resetForm,selectDictLabel, selectDictLabels,addDateRange } from "@/utils/ruoyi";
 //topology 
 //注册图标
 import { registerIcons,registerSvgs } from "@/utils/topology/customgraph.js";
 // import {encryption,decrypt} from "@/utils/rsautils.js";
 registerIcons();
 registerSvgs();
-import {topologyDict} from "../package/index.js"
-let topologyDicts=topologyDict;
-Vue.prototype.topologyDict=Object.assign({},topologyDicts);
+import { getDicts } from "@/api/dict/data";
 Vue.config.productionTip = false
 Vue.use(Antd);
-Vue.use(ElementUI, { locale })
+Vue.use(ElementUI)
+import Pagination from "@/components/Pagination";
+Vue.prototype.msgSuccess = function (msg) {
+  this.$message({ showClose: true, message: msg, type: "success" });
+}
+
+Vue.prototype.msgError = function (msg) {
+  this.$message({ showClose: true, message: msg, type: "error" });
+}
+
+Vue.prototype.msgInfo = function (msg) {
+  this.$message.info(msg);
+}
+Vue.component('Pagination', Pagination)
+Vue.prototype.parseTime = parseTime
+Vue.prototype.resetForm = resetForm
+Vue.prototype.getDicts = getDicts
+Vue.prototype.selectDictLabel = selectDictLabel
+Vue.prototype.selectDictLabels = selectDictLabels
+Vue.prototype.addDateRange=addDateRange
 new Vue({
   router,
   store,

src/router/index.js

@@ -10,9 +10,9 @@ VueRouter.prototype.push = function push(location) {
 }
 const routes = [
   {
-    path: '/',
+    path: '/topologyView/list',
     name: 'Index',
-    component: () =>import('@/views/test/Test.vue')
+    component: () =>import('@/views/configuration/ParamsConfig.vue')
   },
   {
     path: '/toplogyView/workspace',
@@ -23,6 +23,21 @@ const routes = [
     path: '/toplogyView/preview',
     name: 'Preview',
     component: () =>import('@/views/topology/Preview.vue')
+  },
+  {
+    path: '/toplogyView/job',
+    name: 'Job',
+    component: () =>import('@/views/job/index.vue')
+  },
+  {
+    path: '/toplogyView/dict/data/:dictId',
+    name: 'DictData',
+    component: () =>import('@/views/dict/data.vue')
+  },
+  {
+    path: '/toplogyView/dict/type',
+    name: 'DictType',
+    component: () =>import('@/views/dict/index.vue')
   }
 ]
 

src/utils/ruoyi.js

+/**
+ * 通用js方法封装处理
+ * Copyright (c) 2019 ruoyi
+ */
+
+const baseURL = process.env.VUE_APP_BASE_API
+
+// 日期格式化
+export function parseTime(time, pattern) {
+	if (arguments.length === 0 || !time) {
+		return null
+	}
+	const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
+	let date
+	if (typeof time === 'object') {
+		date = time
+	} else {
+		if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
+			time = parseInt(time)
+		} else if (typeof time === 'string') {
+			time = time.replace(new RegExp(/-/gm), '/');
+		}
+		if ((typeof time === 'number') && (time.toString().length === 10)) {
+			time = time * 1000
+		}
+		date = new Date(time)
+	}
+	const formatObj = {
+		y: date.getFullYear(),
+		m: date.getMonth() + 1,
+		d: date.getDate(),
+		h: date.getHours(),
+		i: date.getMinutes(),
+		s: date.getSeconds(),
+		a: date.getDay()
+	}
+	const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
+		let value = formatObj[key]
+		// Note: getDay() returns 0 on Sunday
+		if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] }
+		if (result.length > 0 && value < 10) {
+			value = '0' + value
+		}
+		return value || 0
+	})
+	return time_str
+}
+
+// 表单重置
+export function resetForm(refName) {
+	if (this.$refs[refName]) {
+		this.$refs[refName].resetFields();
+	}
+}
+
+// 添加日期范围
+export function addDateRange(params, dateRange, propName) {
+	var search = params;
+	search.params = {};
+	if (null != dateRange && '' != dateRange) {
+		if (typeof(propName) === "undefined") {
+			search.params["beginTime"] = dateRange[0];
+			search.params["endTime"] = dateRange[1];
+		} else {
+			search.params["begin" + propName] = dateRange[0];
+			search.params["end" + propName] = dateRange[1];
+		}
+	}
+	return search;
+}
+
+// 回显数据字典
+export function selectDictLabel(datas, value) {
+	var actions = [];
+	Object.keys(datas).some((key) => {
+		if (datas[key].dictValue == ('' + value)) {
+			actions.push(datas[key].dictLabel);
+			return true;
+		}
+	})
+	return actions.join('');
+}
+
+// 回显数据字典（字符串数组）
+export function selectDictLabels(datas, value, separator) {
+	var actions = [];
+	var currentSeparator = undefined === separator ? "," : separator;
+	var temp = value.split(currentSeparator);
+	Object.keys(value.split(currentSeparator)).some((val) => {
+		Object.keys(datas).some((key) => {
+			if (datas[key].dictValue == ('' + temp[val])) {
+				actions.push(datas[key].dictLabel + currentSeparator);
+			}
+		})
+	})
+	return actions.join('').substring(0, actions.join('').length - 1);
+}
+
+// 通用下载方法
+export function download(fileName) {
+	window.location.href = baseURL + "/common/download?fileName=" + encodeURI(fileName) + "&delete=" + true;
+}
+
+// 字符串格式化(%s )
+export function sprintf(str) {
+	var args = arguments, flag = true, i = 1;
+	str = str.replace(/%s/g, function () {
+		var arg = args[i++];
+		if (typeof arg === 'undefined') {
+			flag = false;
+			return '';
+		}
+		return arg;
+	});
+	return flag ? str : '';
+}
+
+// 转换字符串，undefined,null等转化为""
+export function praseStrEmpty(str) {
+	if (!str || str == "undefined" || str == "null") {
+		return "";
+	}
+	return str;
+}
+
+/**
+ * 构造树型结构数据
+ * @param {*} data 数据源
+ * @param {*} id id字段 默认 'id'
+ * @param {*} parentId 父节点字段 默认 'parentId'
+ * @param {*} children 孩子节点字段 默认 'children'
+ * @param {*} rootId 根Id 默认 0
+ */
+export function handleTree(data, id, parentId, children, rootId) {
+	id = id || 'id'
+	parentId = parentId || 'parentId'
+	children = children || 'children'
+	rootId = rootId || Math.min.apply(Math, data.map(item => { return item[parentId] })) || 0
+	//对源数据深度克隆
+	const cloneData = JSON.parse(JSON.stringify(data))
+	//循环所有项
+	const treeData = cloneData.filter(father => {
+		let branchArr = cloneData.filter(child => {
+			//返回每一项的子级数组
+			return father[id] === child[parentId]
+		});
+		branchArr.length > 0 ? father.children = branchArr : '';
+		//返回第一层
+		return father[parentId] === rootId;
+	});
+	return treeData != '' ? treeData : data;
+}

src/utils/topology-dict.js

@@ -10,7 +10,12 @@ let tagType = [
     { "dictLabel": "Node", "dictValue": 0 },
     { "dictLabel": "Line", "dictValue": 1 },
 ]
+let statusOptions=[
+    { "dictLabel": "正常", "dictValue": "0" },
+    { "dictLabel": "暂停", "dictValue": "1" },
+]
 export{
     dataAcquisitionMode,
-    tagType
+    tagType,
+    statusOptions
 }
\ No newline at end of file

src/views/configuration/ParamsConfig.vue

 <template>
   <div class="app-container">
     <el-card>
-      <el-row :gutter="10" class="mb8">
+      <el-row :gutter="5" class="mb8">
         <el-col :span="24">
           <!-- v-hasPermi="['topology:index:add']" -->
           <el-button
@@ -12,6 +12,22 @@
             @click="addTopology"
             >创建组态</el-button
           >
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="addJob"
+            >定时任务</el-button
+          >
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="addDict"
+            >字典</el-button
+          >
         </el-col>
       </el-row>
       <el-row>
@@ -130,7 +146,6 @@
 <script>
 import AddParams from "./modules/AddParams.vue";
 import AddMutual from "./modules/AddMutual.vue";
-import Pagination from "@/components/Pagination";
 import PreviewToImg from "@/components/topology/PreviewToImg.vue";
 import { deleteTopologyHandle, list, deleteTopology } from "@/api/topology.js";
 export default {
@@ -153,7 +168,6 @@ export default {
     AddParams,
     PreviewToImg,
     AddMutual,
-    Pagination,
   },
   data() {
     return {
@@ -231,6 +245,16 @@ export default {
         path: this.editorUrl,
       });
     },
+    addJob() {
+      this.$router.push({
+        path: "/toplogyView/job",
+      });
+    },
+    addDict() {
+      this.$router.push({
+        path: "/toplogyView/dict/type",
+      });
+    },
     removeTopology(id) {
       this.$confirm("确认要删除吗?", "警告", {
         confirmButtonText: "确定",

src/views/configuration/modules/AddMutual.vue

@@ -85,7 +85,7 @@
                       @click="handleEdit(scope.$index, scope.row)"
                       type="primary"
                       style="margin-right: 5px"
-                      >Edit</el-button
+                      >修改</el-button
                     >
                     <!-- 保存 -->
                     <el-button
@@ -95,7 +95,7 @@
                       v-if="scope.row.edit"
                       @click="handleSave(scope.$index, scope.row)"
                       style="margin-right: 5px"
-                      >Save</el-button
+                      >保存</el-button
                     >
                   </div>
                   <!-- 添加控制 -->
@@ -110,7 +110,7 @@
                       :plain="true"
                       v-if="scope.row.edit"
                       @click="handleSave(scope.$index, scope.row)"
-                      >Save</el-button
+                      >保存</el-button
                     >
                   </div>
                   <!-- 全局控制删除 -->
@@ -120,7 +120,7 @@
                     :plain="true"
                     type="danger"
                     @click="handleDeleteIt(scope.$index, scope.row)"
-                    >Delete</el-button
+                    >删除</el-button
                   >
                 </template>
               </el-table-column>

src/views/configuration/modules/AddParams.vue

@@ -126,10 +126,12 @@ export default {
       loading: false,
       //切换下一步
       current: 0,
+      // 采集数据字典
+      dataAcquisitionMode: [],
+      //tagType类型
+      tagType: [],
       // 表单校验
       rules: {},
-      dataAcquisitionMode:this.topologyDict.dataAcquisitionMode,
-      tagType:this.topologyDict.tagType,
       // 表单参数
       form: {
         dataAcquisitionMode: "",
@@ -147,13 +149,18 @@ export default {
     update(row) {
       this.open = true;
       this.title = "设置参数";
+      this.getDicts("data_acquisition_mode").then((response) => {
+        this.dataAcquisitionMode = response.data;
+      });
+      this.getDicts("tag_type").then((response) => {
+        this.tagType = response.data;
+      });
       this.topologyData = Object.assign({}, row);
       this.fileData = Object.assign({}, JSON.parse(row.data));
       this.handleList = [];
       if (this.fileData.topologyHandle) {
         if (!!this.fileData.topologyHandle.dataAcquisitionMode) {
-          this.form.dataAcquisitionMode =
-            this.fileData.topologyHandle.dataAcquisitionMode;
+          this.form.dataAcquisitionMode = this.fileData.topologyHandle.dataAcquisitionMode;
         }
         if (!!this.fileData.topologyHandle.sentence) {
           this.form.sentence = this.fileData.topologyHandle.sentence;
@@ -241,17 +248,6 @@ export default {
     typeFormat(row, column) {
       return this.selectDictLabel(this.tagType, row.type);
     },
-    // 回显数据字典
-    selectDictLabel(datas, value) {
-      var actions = [];
-      Object.keys(datas).some((key) => {
-        if (datas[key].dictValue == "" + value) {
-          actions.push(datas[key].dictLabel);
-          return true;
-        }
-      });
-      return actions.join("");
-    },
     next() {
       if (!this.form.dataAcquisitionMode) {
         this.$message.warning("请选择获取方式");

src/views/dict/data.vue

+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="visible"
+    width="90%"
+    append-to-body
+  >
+    <div class="app-container">
+      <el-card>
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          :inline="true"
+          v-show="showSearch"
+          label-width="68px"
+        >
+          <el-form-item label="字典名称" prop="dictType">
+            <el-select v-model="queryParams.dictType" size="small">
+              <el-option
+                v-for="item in typeOptions"
+                :key="item.dictId"
+                :label="item.dictName"
+                :value="item.dictType"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="字典标签" prop="dictLabel">
+            <el-input
+              v-model="queryParams.dictLabel"
+              placeholder="请输入字典标签"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="状态" prop="status">
+            <el-select
+              v-model="queryParams.status"
+              placeholder="数据状态"
+              clearable
+              size="small"
+            >
+              <el-option
+                v-for="dict in statusOptions"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="dict.dictValue"
+              />
+            </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"
+              >新增</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="success"
+              plain
+              icon="el-icon-edit"
+              size="mini"
+              :disabled="single"
+              @click="handleUpdate"
+              >修改</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="danger"
+              plain
+              icon="el-icon-delete"
+              size="mini"
+              :disabled="multiple"
+              @click="handleDelete"
+              >删除</el-button
+            >
+          </el-col>
+        </el-row>
+
+        <el-table
+          v-loading="loading"
+          :data="dataList"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="字典编码" align="center" prop="dictCode" />
+          <el-table-column label="字典标签" align="center" prop="dictLabel" />
+          <el-table-column label="字典键值" align="center" prop="dictValue" />
+          <el-table-column label="字典排序" align="center" prop="dictSort" />
+          <el-table-column
+            label="状态"
+            align="center"
+            prop="status"
+            :formatter="statusFormat"
+          />
+          <el-table-column
+            label="备注"
+            align="center"
+            prop="remark"
+            :show-overflow-tooltip="true"
+          />
+          <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-edit"
+                @click="handleUpdate(scope.row)"
+                >修改</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                >删除</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="title"
+          :visible.sync="open"
+          width="500px"
+          append-to-body
+        >
+          <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+            <el-form-item label="字典类型">
+              <el-input v-model="form.dictType" :disabled="true" />
+            </el-form-item>
+            <el-form-item label="数据标签" prop="dictLabel">
+              <el-input v-model="form.dictLabel" placeholder="请输入数据标签" />
+            </el-form-item>
+            <el-form-item label="数据键值" prop="dictValue">
+              <el-input v-model="form.dictValue" placeholder="请输入数据键值" />
+            </el-form-item>
+            <el-form-item label="显示排序" prop="dictSort">
+              <el-input-number
+                v-model="form.dictSort"
+                controls-position="right"
+                :min="0"
+              />
+            </el-form-item>
+            <el-form-item label="状态" prop="status">
+              <el-radio-group v-model="form.status">
+                <el-radio
+                  v-for="dict in statusOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictValue"
+                  >{{ dict.dictLabel }}</el-radio
+                >
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="备注" prop="remark">
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                placeholder="请输入内容"
+              ></el-input>
+            </el-form-item>
+          </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-card>
+    </div>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="close">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import {
+  listData,
+  getData,
+  delData,
+  addData,
+  updateData,
+  exportData,
+} from "@/api/dict/data";
+import { listType, getType } from "@/api/dict/type";
+
+export default {
+  name: "Data",
+  data() {
+    return {
+      visible: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 字典表格数据
+      dataList: [],
+      // 默认字典类型
+      defaultDictType: "",
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 状态数据字典
+      statusOptions: [],
+      // 类型数据字典
+      typeOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        dictName: undefined,
+        dictType: undefined,
+        status: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        dictLabel: [
+          { required: true, message: "数据标签不能为空", trigger: "blur" },
+        ],
+        dictValue: [
+          { required: true, message: "数据键值不能为空", trigger: "blur" },
+        ],
+        dictSort: [
+          { required: true, message: "数据顺序不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  methods: {
+    edit(dictId) {
+      this.visible = true;
+      this.getType(dictId);
+      this.getTypeList();
+      this.getDicts("sys_normal_disable").then((response) => {
+        this.statusOptions = response.data;
+      });
+    },
+    close(){
+      this.visible =false
+    },
+    /** 查询字典类型详细 */
+    getType(dictId) {
+      getType(dictId).then((response) => {
+        this.queryParams.dictType = response.data.dictType;
+        this.defaultDictType = response.data.dictType;
+        this.getList();
+      });
+    },
+    /** 查询字典类型列表 */
+    getTypeList() {
+      listType().then((response) => {
+        this.typeOptions = response.rows;
+      });
+    },
+    /** 查询字典数据列表 */
+    getList() {
+      this.loading = true;
+      listData(this.queryParams).then((response) => {
+        this.dataList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 数据状态字典翻译
+    statusFormat(row, column) {
+      return this.selectDictLabel(this.statusOptions, row.status);
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        dictCode: undefined,
+        dictLabel: undefined,
+        dictValue: undefined,
+        dictSort: 0,
+        status: "0",
+        remark: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.queryParams.dictType = this.defaultDictType;
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加字典数据";
+      this.form.dictType = this.queryParams.dictType;
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.dictCode);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const dictCode = row.dictCode || this.ids;
+      getData(dictCode).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改字典数据";
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function () {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.dictCode != undefined) {
+            updateData(this.form).then((response) => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addData(this.form).then((response) => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const dictCodes = row.dictCode || this.ids;
+      this.$confirm(
+        '是否确认删除字典编码为"' + dictCodes + '"的数据项?',
+        "警告",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
+        .then(function () {
+          return delData(dictCodes);
+        })
+        .then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm("是否确认导出所有数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(function () {
+          return exportData(queryParams);
+        })
+        .then((response) => {
+          this.download(response.msg);
+        });
+    },
+  },
+};
+</script>
\ No newline at end of file

src/views/dict/index.vue

+<template>
+  <div class="app-container">
+    <el-card>
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="23">
+          <el-form
+            :model="queryParams"
+            ref="queryForm"
+            :inline="true"
+            v-show="showSearch"
+            label-width="68px"
+          >
+            <el-form-item label="字典名称" prop="dictName">
+              <el-input
+                v-model="queryParams.dictName"
+                placeholder="请输入字典名称"
+                clearable
+                size="small"
+                style="width: 240px"
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="字典类型" prop="dictType">
+              <el-input
+                v-model="queryParams.dictType"
+                placeholder="请输入字典类型"
+                clearable
+                size="small"
+                style="width: 240px"
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="状态" prop="status">
+              <el-select
+                v-model="queryParams.status"
+                placeholder="字典状态"
+                clearable
+                size="small"
+                style="width: 240px"
+              >
+                <el-option
+                  v-for="dict in statusOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="创建时间">
+              <el-date-picker
+                v-model="dateRange"
+                size="small"
+                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-col>
+        <el-col :span="1"
+          ><el-button type="primary" size="mini" @click="onBack"
+            >返回</el-button
+          >
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+            >新增</el-button
+          >
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="success"
+            plain
+            icon="el-icon-edit"
+            size="mini"
+            :disabled="single"
+            @click="handleUpdate"
+            >修改</el-button
+          >
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="danger"
+            plain
+            icon="el-icon-delete"
+            size="mini"
+            :disabled="multiple"
+            @click="handleDelete"
+            >删除</el-button
+          >
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            >导出</el-button
+          >
+        </el-col>
+      </el-row>
+
+      <el-table
+        v-loading="loading"
+        :data="typeList"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="字典编号" align="center" prop="dictId" />
+        <el-table-column
+          label="字典名称"
+          align="center"
+          prop="dictName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="字典类型"
+          align="center"
+          :show-overflow-tooltip="true"
+        >
+          <template slot-scope="scope">
+            <a @click="openDictData(scope.row.dictId)">{{
+              scope.row.dictType
+            }}</a>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="状态"
+          align="center"
+          prop="status"
+          :formatter="statusFormat"
+        />
+        <el-table-column
+          label="备注"
+          align="center"
+          prop="remark"
+          :show-overflow-tooltip="true"
+        />
+        <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-edit"
+              @click="handleUpdate(scope.row)"
+              >修改</el-button
+            >
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+              >删除</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="title"
+        :visible.sync="open"
+        width="500px"
+        append-to-body
+      >
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+          <el-form-item label="字典名称" prop="dictName">
+            <el-input v-model="form.dictName" placeholder="请输入字典名称" />
+          </el-form-item>
+          <el-form-item label="字典类型" prop="dictType">
+            <el-input v-model="form.dictType" placeholder="请输入字典类型" />
+          </el-form-item>
+          <el-form-item label="状态" prop="status">
+            <el-radio-group v-model="form.status">
+              <el-radio
+                v-for="dict in statusOptions"
+                :key="dict.dictValue"
+                :label="dict.dictValue"
+                >{{ dict.dictLabel }}</el-radio
+              >
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="备注" prop="remark">
+            <el-input
+              v-model="form.remark"
+              type="textarea"
+              placeholder="请输入内容"
+            ></el-input>
+          </el-form-item>
+        </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-card>
+    <Data ref="dictData" />
+  </div>
+</template>
+
+<script>
+import {
+  listType,
+  getType,
+  delType,
+  addType,
+  updateType,
+  exportType,
+  clearCache,
+} from "@/api/dict/type";
+import Data from "./data.vue";
+export default {
+  name: "Dict",
+  components: {
+    Data,
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 字典表格数据
+      typeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 状态数据字典
+      statusOptions: [],
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        dictName: undefined,
+        dictType: undefined,
+        status: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        dictName: [
+          { required: true, message: "字典名称不能为空", trigger: "blur" },
+        ],
+        dictType: [
+          { required: true, message: "字典类型不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("sys_normal_disable").then((response) => {
+      this.statusOptions = response.data;
+    });
+  },
+  methods: {
+    onBack() {
+      this.$router.go(-1);
+    },
+    openDictData(dictId) {
+      this.$refs.dictData.edit(dictId);
+    },
+    /** 查询字典类型列表 */
+    getList() {
+      this.loading = true;
+      listType(this.addDateRange(this.queryParams, this.dateRange)).then(
+        (response) => {
+          this.typeList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    // 字典状态字典翻译
+    statusFormat(row, column) {
+      return this.selectDictLabel(this.statusOptions, row.status);
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        dictId: undefined,
+        dictName: undefined,
+        dictType: undefined,
+        status: "0",
+        remark: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加字典类型";
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.dictId);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const dictId = row.dictId || this.ids;
+      getType(dictId).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改字典类型";
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function () {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.dictId != undefined) {
+            updateType(this.form).then((response) => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addType(this.form).then((response) => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const dictIds = row.dictId || this.ids;
+      this.$confirm(
+        '是否确认删除字典编号为"' + dictIds + '"的数据项?',
+        "警告",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
+        .then(function () {
+          return delType(dictIds);
+        })
+        .then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm("是否确认导出所有类型数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(function () {
+          return exportType(queryParams);
+        })
+        .then((response) => {
+          this.download(response.msg);
+        });
+    },
+    /** 清理缓存按钮操作 */
+    handleClearCache() {
+      clearCache().then((response) => {
+        this.msgSuccess("清理成功");
+      });
+    },
+  },
+};
+</script>
\ No newline at end of file

src/views/job/index.vue

+<template>
+  <div class="app-container">
+    <el-card>
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="23">
+          <el-form
+            :model="queryParams"
+            ref="queryForm"
+            :inline="true"
+            v-show="showSearch"
+            label-width="68px"
+          >
+            <el-form-item label="任务名称" prop="jobName">
+              <el-input
+                v-model="queryParams.jobName"
+                placeholder="请输入任务名称"
+                clearable
+                size="small"
+                @keyup.enter.native="handleQuery"
+              />
+            </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-col>
+        <el-col :span="1"
+          ><el-button type="primary" size="mini" @click="onBack"
+            >返回</el-button
+          >
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+            >新增</el-button
+          >
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="success"
+            plain
+            icon="el-icon-edit"
+            size="mini"
+            :disabled="single"
+            @click="handleUpdate"
+            >修改</el-button
+          >
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="danger"
+            plain
+            icon="el-icon-delete"
+            size="mini"
+            :disabled="multiple"
+            @click="handleDelete"
+            >删除</el-button
+          >
+        </el-col>
+      </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="任务编号" align="center" prop="jobId" />
+        <el-table-column
+          label="任务名称"
+          align="center"
+          prop="jobName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="任务组名"
+          align="center"
+          prop="jobGroup"
+          :formatter="jobGroupFormat"
+        />
+        <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-caret-right"
+              @click="handleRun(scope.row)"
+              >执行一次</el-button
+            >
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-view"
+              @click="handleView(scope.row)"
+              >详细</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="title"
+        :visible.sync="open"
+        width="700px"
+        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 jobGroupOptions"
+                    :key="dict.dictValue"
+                    :label="dict.dictLabel"
+                    :value="dict.dictValue"
+                  ></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调用示例：ryTask.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="12">
+              <el-form-item label="cron表达式" prop="cronExpression">
+                <el-input
+                  v-model="form.cronExpression"
+                  placeholder="请输入cron执行表达式"
+                />
+              </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-col :span="24">
+              <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="24">
+              <el-form-item label="状态">
+                <el-radio-group v-model="form.status">
+                  <el-radio
+                    v-for="dict in statusOptions"
+                    :key="dict.dictValue"
+                    :label="dict.dictValue"
+                    >{{ dict.dictLabel }}</el-radio
+                  >
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="参数">
+                <el-select v-model="form.parameter" placeholder="请选择">
+                  <el-option value="" label="请选择"></el-option>
+                  <el-option
+                    v-for="item of topologyList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  ></el-option>
+                </el-select>
+              </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="任务详细"
+        :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="下次执行时间：">{{
+                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>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {
+  listJob,
+  getJob,
+  delJob,
+  addJob,
+  updateJob,
+  exportJob,
+  runJob,
+  changeJobStatus,
+} from "@/api/job";
+import { list } from "@/api/topology.js";
+export default {
+  name: "Job",
+  components: {},
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 定时任务表格数据
+      jobList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否显示详细弹出层
+      openView: false,
+      // 任务组名字典
+      jobGroupOptions: [],
+      // 状态字典
+      statusOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        jobName: undefined,
+        jobGroup: undefined,
+        status: undefined,
+      },
+      // 表单参数
+      form: {},
+      //组态参数
+      topologyList: [],
+      // 表单校验
+      rules: {
+        jobName: [
+          { required: true, message: "任务名称不能为空", trigger: "blur" },
+        ],
+        invokeTarget: [
+          {
+            required: true,
+            message: "调用目标字符串不能为空",
+            trigger: "blur",
+          },
+        ],
+        cronExpression: [
+          {
+            required: true,
+            message: "cron执行表达式不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("sys_job_group").then((response) => {
+      this.jobGroupOptions = response.data;
+    });
+    this.getDicts("sys_job_status").then((response) => {
+      this.statusOptions = response.data;
+    });
+    list().then((res) => {
+      if (res.code === 200) {
+        this.topologyList = res.rows;
+      }
+    });
+  },
+  methods: {
+    onBack() {
+      this.$router.go(-1);
+    },
+    /** 查询定时任务列表 */
+    getList() {
+      this.loading = true;
+      listJob(this.queryParams).then((response) => {
+        this.jobList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 任务组名字典翻译
+    jobGroupFormat(row, column) {
+      return "";
+    },
+    // 状态字典翻译
+    statusFormat(row, column) {
+      return "";
+    },
+    // 取消按钮
+    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;
+    },
+    // 任务状态修改
+    handleStatusChange(row) {
+      let text = row.status === "0" ? "启用" : "停用";
+      this.$confirm(
+        '确认要"' + text + '""' + row.jobName + '"任务吗?',
+        "警告",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
+        .then(function () {
+          return changeJobStatus(row.jobId, row.status);
+        })
+        .then(() => {
+          this.msgSuccess(text + "成功");
+        })
+        .catch(function () {
+          row.status = row.status === "0" ? "1" : "0";
+        });
+    },
+    /* 立即执行一次 */
+    handleRun(row) {
+      this.$confirm('确认要立即执行一次"' + row.jobName + '"任务吗?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(function () {
+          return runJob(row.jobId, row.jobGroup);
+        })
+        .then(() => {
+          this.msgSuccess("执行成功");
+        });
+    },
+    /** 任务详细信息 */
+    handleView(row) {
+      getJob(row.jobId).then((response) => {
+        this.form = response.data;
+        this.openView = true;
+      });
+    },
+    /** 任务日志列表查询 */
+    handleJobLog() {
+      this.$router.push("/job/log");
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加任务";
+      list().then((res) => {
+        if (res.code === 200) {
+          this.topologyList = res.rows;
+        }
+      });
+    },
+    /** 修改按钮操作 */
+    async handleUpdate(row) {
+      this.reset();
+      const jobId = row.jobId || this.ids;
+      await getJob(jobId).then((response) => {
+        this.form = response.data;
+        // console.log(response.data)
+        // let index = response.data.invokeTarget.indexOf("'");
+        // let index1 = response.data.invokeTarget.lastIndexOf("'");
+        // console.log(index1)
+        // let i = "";
+        // if (index > -1&&index1>-1) {
+        //   i = response.data.invokeTarget.substring(
+        //     index + 1,
+        //     index1
+        //   );
+        // }
+        // console.log(i);
+        // this.form.parameter =Number(i)===NaN?"":Number(i);
+        // this.form.invokeTarget=this.form.invokeTarget.replace(i)
+        this.open = true;
+        this.title = "修改任务";
+      });
+      list().then((res) => {
+        if (res.code === 200) {
+          this.topologyList = res.rows;
+        }
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function () {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.parameter) {
+            let index = this.form.invokeTarget.indexOf("(");
+            this.form.invokeTarget =
+              this.form.invokeTarget.substr(
+                0,
+                index > -1 ? index : this.form.invokeTarget.length
+              ) +
+              "('" +
+              this.form.parameter +
+              "')";
+          }
+          if (this.form.jobId != undefined) {
+            updateJob(this.form).then((response) => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addJob(this.form).then((response) => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const jobIds = row.jobId || this.ids;
+      this.$confirm(
+        '是否确认删除定时任务编号为"' + jobIds + '"的数据项?',
+        "警告",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
+        .then(function () {
+          return delJob(jobIds);
+        })
+        .then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm("是否确认导出所有定时任务数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(function () {
+          return exportJob(queryParams);
+        })
+        .then((response) => {
+          this.download(response.msg);
+        });
+    },
+  },
+};
+</script>
\ No newline at end of file

src/views/job/log.vue

+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="任务名称" prop="jobName">
+        <el-input
+          v-model="queryParams.jobName"
+          placeholder="请输入任务名称"
+          clearable
+          size="small"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="任务组名" prop="jobGroup">
+        <el-select
+          v-model="queryParams.jobGroup"
+          placeholder="请任务组名"
+          clearable
+          size="small"
+          style="width: 240px"
+        >
+          <el-option
+            v-for="dict in jobGroupOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="执行状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择执行状态"
+          clearable
+          size="small"
+          style="width: 240px"
+        >
+          <el-option
+            v-for="dict in statusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="执行时间">
+        <el-date-picker
+          v-model="dateRange"
+          size="small"
+          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>
+      <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" :formatter="jobGroupFormat" :show-overflow-tooltip="true" />
+      <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" :formatter="statusFormat" />
+      <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 { listJobLog, delJobLog, exportJobLog, cleanJobLog } from "@/api/monitor/jobLog";
+
+export default {
+  name: "JobLog",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 调度日志表格数据
+      jobLogList: [],
+      // 是否显示弹出层
+      open: false,
+      // 日期范围
+      dateRange: [],
+      // 表单参数
+      form: {},
+      // 执行状态字典
+      statusOptions: [],
+      // 任务组名字典
+      jobGroupOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        jobName: undefined,
+        jobGroup: undefined,
+        status: undefined
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("sys_job_status").then(response => {
+      this.statusOptions = response.data;
+    });
+    this.getDicts("sys_job_group").then(response => {
+      this.jobGroupOptions = response.data;
+    });
+  },
+  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;
+        }
+      );
+    },
+    // 执行状态字典翻译
+    statusFormat(row, column) {
+      return this.selectDictLabel(this.statusOptions, row.status);
+    },
+    // 任务组名字典翻译
+    jobGroupFormat(row, column) {
+      return this.selectDictLabel(this.jobGroupOptions, row.jobGroup);
+    },
+    /** 搜索按钮操作 */
+    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.$confirm('是否确认删除调度日志编号为"' + jobLogIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delJobLog(jobLogIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 清空按钮操作 */
+    handleClean() {
+      this.$confirm("是否确认清空所有调度日志数据项?", "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return cleanJobLog();
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("清空成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm("是否确认导出所有调度日志数据项?", "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportJobLog(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    }
+  }
+};
+</script>
\ No newline at end of file

src/views/topology/Preview.vue

 <template>
   <div style="overflow: hidden">
-    <div id="topology-hrhx" style="width: 100%; height: 100vh"></div>
+    <div id="topology-hrhx" style="width: 100%; height: 100vh;overflow: hidden"></div>
     <div class="tools">
       <a-button type="primary" @click="onBack">
         <a-icon type="left" /> 返回
@@ -48,12 +48,6 @@ export default {
   },
   methods: {
     onBack() {
-      // this.$router.push({
-      //   path: "/workspace",
-      //   query: {
-      //     id: this.$route.query.id,
-      //   },
-      // });
       this.$router.go(-1);
     },
     onSizeWindow() {

src/views/topology/Workspace.vue

@@ -263,11 +263,11 @@ export default {
   props: {
     backUrl: {
       type: String,
-      default: "/",
+      default: "/topologyView/list",
     },
     previewUrl: {
       type: String,
-      default: "/preview",
+      default: "/toplogyView/preview",
     },
   },
   data() {
@@ -348,9 +348,7 @@ export default {
       event.preventDefault();
     },
     back() {
-      this.$router.push({
-        path: this.backUrl,
-      });
+      this.$router.go(-1);
     },
     saveContent(e) {
       var key = window.event.keyCode
@@ -445,7 +443,6 @@ export default {
       });
     },
     async open() {
-      
       if (this.$route.query.id) {
         await getTopologyId(this.$route.query.id)
           .then((res) => {
@@ -464,6 +461,8 @@ export default {
         this.fromArrow = this.canvas.data.fromArrow;
         this.lineName = this.canvas.data.lineName;
         this.canvas.lock(0);
+        this.canvas.closeSocket()
+        this.canvas.closeMqtt()
       }
     },
     init() {
@@ -593,7 +592,6 @@ export default {
       a.dispatchEvent(evt);
     },
     updateProps(node) {
-      console.log(node);
       this.canvas.updateProps(this.canvas.data.pens);
     },
     updateLines(line) {