增加一日流程之任务

ruoyi-ui/src/api/benyi/dayflowmanger.js

@@ -1,53 +0,0 @@
-import request from '@/utils/request'
-
-// 查询一日流程列表
-export function listDetail(query) {
-  return request({
-    url: '/benyi/dayflowmanger/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询一日流程详细
-export function getDetail(id) {
-  return request({
-    url: '/benyi/dayflowmanger/' + id,
-    method: 'get'
-  })
-}
-
-// 新增一日流程
-export function addDetail(data) {
-  return request({
-    url: '/benyi/dayflowmanger',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改一日流程
-export function updateDetail(data) {
-  return request({
-    url: '/benyi/dayflowmanger',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除一日流程
-export function delDetail(id) {
-  return request({
-    url: '/benyi/dayflowmanger/' + id,
-    method: 'delete'
-  })
-}
-
-// 导出一日流程
-export function exportDetail(query) {
-  return request({
-    url: '/benyi/dayflowmanger/export',
-    method: 'get',
-    params: query
-  })
-}

ruoyi-ui/src/assets/styles/index.scss

@@ -4,7 +4,6 @@
 @import './element-ui.scss';
 @import './sidebar.scss';
 @import './btn.scss';
-
 body {
     height: 100%;
     -moz-osx-font-smoothing: grayscale;
@@ -108,11 +107,9 @@ aside {
     color: #2c3e50;
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
-
     a {
         color: #337ab7;
         cursor: pointer;
-
         &:hover {
             color: rgb(32, 160, 255);
         }
@@ -146,16 +143,13 @@ aside {
     padding-right: 20px;
     transition: 600ms ease position;
     background: linear-gradient(90deg, rgba(32, 182, 249, 1) 0%, rgba(32, 182, 249, 1) 0%, rgba(33, 120, 241, 1) 100%, rgba(33, 120, 241, 1) 100%);
-
     .subtitle {
         font-size: 20px;
         color: #fff;
     }
-
     &.draft {
         background: #d0d0d0;
     }
-
     &.deleted {
         background: #d0d0d0;
     }
@@ -165,7 +159,15 @@ aside {
 .link-type:focus {
     color: #337ab7;
     cursor: pointer;
+    &:hover {
+        color: rgb(32, 160, 255);
+    }
+}
 
+.link-dayflow,
+.link-dayflow:focus {
+    color: #337ab7;
+    cursor: pointer;
     &:hover {
         color: rgb(32, 160, 255);
     }
@@ -173,7 +175,6 @@ aside {
 
 .filter-container {
     padding-bottom: 10px;
-
     .filter-item {
         display: inline-block;
         vertical-align: middle;

ruoyi-ui/src/router/index.js

@@ -25,98 +25,106 @@ import Layout from '@/layout'
  */
 
 // 公共路由
-export const constantRoutes = [
+export const constantRoutes = [{
-  {
         path: '/redirect',
         component: Layout,
         hidden: true,
-    children: [
+        children: [{
-      {
             path: '/redirect/:path(.*)',
-        component: () => import('@/views/redirect')
+            component: () =>
-      }
+                import ('@/views/redirect')
-    ]
+        }]
     },
     {
         path: '/login',
-    component: () => import('@/views/login'),
+        component: () =>
+            import ('@/views/login'),
         hidden: true
     },
     {
         path: '/404',
-    component: () => import('@/views/error/404'),
+        component: () =>
+            import ('@/views/error/404'),
         hidden: true
     },
     {
         path: '/401',
-    component: () => import('@/views/error/401'),
+        component: () =>
+            import ('@/views/error/401'),
         hidden: true
     },
     {
         path: '',
         component: Layout,
         redirect: 'index',
-    children: [
+        children: [{
-      {
             path: 'index',
-        component: () => import('@/views/index'),
+            component: () =>
+                import ('@/views/index'),
             name: '首页',
             meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
-      }
+        }]
-    ]
     },
     {
         path: '/user',
         component: Layout,
         hidden: true,
         redirect: 'noredirect',
-    children: [
+        children: [{
-      {
             path: 'profile',
-        component: () => import('@/views/system/user/profile/index'),
+            component: () =>
+                import ('@/views/system/user/profile/index'),
             name: 'Profile',
             meta: { title: '个人中心', icon: 'user' }
-      }
+        }]
-    ]
     },
     {
         path: '/dict',
         component: Layout,
         hidden: true,
-    children: [
+        children: [{
-      {
             path: 'type/data/:dictId(\\d+)',
-        component: () => import('@/views/system/dict/data'),
+            component: () =>
+                import ('@/views/system/dict/data'),
             name: 'Data',
             meta: { title: '字典数据', icon: '' }
-      }
+        }]
-    ]
+    },
+    {
+        path: '/dayflow',
+        component: Layout,
+        hidden: true,
+        children: [{
+            path: 'dayflowmanger/dayflowtask/:id(\\d+)',
+            component: () =>
+                import ('@/views/benyi/dayflow/task'),
+            name: 'Task',
+            meta: { title: '一日流程任务', icon: '' }
+        }]
     },
     {
         path: '/job',
         component: Layout,
         hidden: true,
-    children: [
+        children: [{
-      {
             path: 'log',
-        component: () => import('@/views/monitor/job/log'),
+            component: () =>
+                import ('@/views/monitor/job/log'),
             name: 'JobLog',
             meta: { title: '调度日志' }
-      }
+        }]
-    ]
     },
     {
         path: '/gen',
         component: Layout,
         hidden: true,
-    children: [
+        children: [{
-      {
             path: 'edit',
-        component: () => import('@/views/tool/gen/editTable'),
+            component: () =>
+                import ('@/views/tool/gen/editTable'),
             name: 'GenEdit',
             meta: { title: '修改生成配置' }
-      }
+        }]
-    ]
     }
 ]
 

ruoyi-ui/src/views/benyi/dayflowmanger/index.vue

@@ -1,348 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
-      <el-form-item label="流程类型" prop="flowType">
-        <el-select v-model="queryParams.flowType" placeholder="请选择类型" clearable size="small">
-          <el-option
-            v-for="dict in dayflowtypeOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="流程名称" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          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-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['benyi:dayflowmanger:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['benyi:dayflowmanger:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['benyi:dayflowmanger:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['benyi:dayflowmanger:export']"
-        >导出</el-button>
-      </el-col>
-    </el-row>
-
-    <el-table v-loading="loading" :data="detailList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="流程ID" align="center" prop="id" />
-      <el-table-column label="流程名称" align="center" prop="name" />
-      <el-table-column label="流程序号" align="center" prop="sortNumber" />
-      <el-table-column label="流程任务数量" align="center" prop="targetCount" />
-      <el-table-column label="类型" align="center" prop="flowType" :formatter="dayflowtypeFormat" />
-      <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)"
-            v-hasPermi="['benyi:dayflowmanger:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['benyi:dayflowmanger:remove']"
-          >删除</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="1024px">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="流程序号" prop="sortNumber">
-          <el-input-number v-model="form.sortNumber" controls-position="right" :min="0" />
-        </el-form-item>
-        <el-form-item label="类型" prop="flowType">
-          <el-select v-model="form.flowType" placeholder="请选择类型">
-            <el-option
-              v-for="dict in dayflowtypeOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="导言" prop="content">
-          <el-input v-model="form.content" type="textarea" placeholder="请输入导言" />
-        </el-form-item>
-
-        <el-form-item label="目的" prop="note">
-          <Editor v-model="form.note" />
-        </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>
-  </div>
-</template>
-
-<script>
-import {
-  listDetail,
-  getDetail,
-  delDetail,
-  addDetail,
-  updateDetail,
-  exportDetail
-} from "@/api/benyi/dayflowmanger";
-import Editor from "@/components/Editor";
-
-export default {
-  name: "Detail",
-  components: {
-    Editor
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 总条数
-      total: 0,
-      // 一日流程表格数据
-      detailList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      //一日流程类型
-      dayflowtypeOptions: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        name: undefined,
-        flowType: undefined,
-        createUser: undefined,
-        updateUser: undefined
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
-        content: [{ required: true, message: "导言不能为空", trigger: "blur" }],
-        note: [{ required: true, message: "目的不能为空", trigger: "blur" }],
-        sortNumber: [
-          { required: true, message: "流程序号不能为空", trigger: "blur" }
-        ],
-        flowType: [
-          { required: true, message: "流程类型不能为空", trigger: "blur" }
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-    this.getDicts("sys_dayflow_type").then(response => {
-      this.dayflowtypeOptions = response.data;
-    });
-  },
-  methods: {
-    /** 查询一日流程列表 */
-    getList() {
-      this.loading = true;
-      listDetail(this.queryParams).then(response => {
-        this.detailList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 流程类型--字典状态字典翻译
-    dayflowtypeFormat(row, column) {
-      return this.selectDictLabel(this.dayflowtypeOptions, row.flowType);
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        sortNumber: 0,
-        targetCount: undefined,
-        name: undefined,
-        content: undefined,
-        note: undefined,
-        flowType: undefined,
-        createUser: undefined,
-        updateUser: undefined,
-        createTime: undefined,
-        updateTime: undefined
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id);
-      this.single = selection.length != 1;
-      this.multiple = !selection.length;
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加一日流程";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids;
-      getDetail(id).then(response => {
-        this.form = response.data;
-        console.log(response.data);
-        this.open = true;
-        this.title = "修改一日流程";
-      });
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != undefined) {
-            updateDetail(this.form).then(response => {
-              if (response.code === 200) {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              } else {
-                this.msgError(response.msg);
-              }
-            });
-          } else {
-            addDetail(this.form).then(response => {
-              if (response.code === 200) {
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              } else {
-                this.msgError(response.msg);
-              }
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm(
-        '是否确认删除一日流程编号为"' + ids + '"的数据项?',
-        "警告",
-        {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }
-      )
-        .then(function() {
-          return delDetail(ids);
-        })
-        .then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-        .catch(function() {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm("是否确认导出所有一日流程数据项?", "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(function() {
-          return exportDetail(queryParams);
-        })
-        .then(response => {
-          this.download(response.msg);
-        })
-        .catch(function() {});
-    }
-  }
-};
-</script>

ruoyi-ui/src/views/system/dict/data.vue

@@ -85,7 +85,7 @@
       <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">
+      <el-table-column label="创建时间" align="center" prop="createTime" width="130">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>

ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayFlowDetailController.java

@@ -30,7 +30,7 @@ import com.ruoyi.framework.web.page.TableDataInfo;
  * @date 2020-05-07
  */
 @RestController
-@RequestMapping("/benyi/dayflowmanger")
+@RequestMapping("/benyi/dayflow/dayflowmanger")
 public class ByDayFlowDetailController extends BaseController
 {
     @Autowired
@@ -45,6 +45,7 @@ public class ByDayFlowDetailController extends BaseController
     {
         startPage();
         List<ByDayFlowDetail> list = byDayFlowDetailService.selectByDayFlowDetailList(byDayFlowDetail);
+        System.out.println("-------------------------------"+list);
         return getDataTable(list);
     }