From baa475589e39e15044b51f5cd7dc975ad84e8c9c Mon Sep 17 00:00:00 2001
From: sk1551 <15175617877@163.com>
Date: Tue, 26 May 2020 15:49:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E6=97=A5=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E8=B7=B3=E8=BD=AC=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/api/benyi/dayflow/standard.js    | 54 -------------------
 ruoyi-ui/src/router/index.js                  | 48 ++++++++---------
 ruoyi-ui/src/views/benyi/dayflow/index.vue    |  1 -
 ruoyi-ui/src/views/benyi/dayflow/standard.vue |  2 +-
 .../ByDayFlowStandardController.java          |  2 +-
 .../mybatis/benyi/ByDayFlowDetailMapper.xml   |  3 +-
 6 files changed, 28 insertions(+), 82 deletions(-)
 delete mode 100644 ruoyi-ui/src/api/benyi/dayflow/standard.js

diff --git a/ruoyi-ui/src/api/benyi/dayflow/standard.js b/ruoyi-ui/src/api/benyi/dayflow/standard.js
deleted file mode 100644
index 70def04a7..000000000
--- a/ruoyi-ui/src/api/benyi/dayflow/standard.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import request from '@/utils/request'
-
-// 查询一日流程标准列表
-export function listStandard(query) {
-    return request({
-        url: '/benyi/dayflow/standard/list',
-        method: 'get',
-        params: query
-    })
-}
-
-// 查询一日流程标准详细
-export function getStandard(sid) {
-    return request({
-        url: '/benyi/dayflow/standard/' + sid,
-        method: 'get'
-    })
-}
-
-
-// 新增一日流程标准
-export function addStandard(data) {
-    return request({
-        url: '/benyi/dayflow/standard',
-        method: 'post',
-        data: data
-    })
-}
-
-// 修改一日流程标准
-export function updateStandard(data) {
-    return request({
-        url: '/benyi/dayflow/standard',
-        method: 'put',
-        data: data
-    })
-}
-
-// 删除一日流程标准
-export function delStandard(sid) {
-    return request({
-        url: '/benyi/dayflow/standard/' + sid,
-        method: 'delete'
-    })
-}
-
-// 导出一日流程标准
-export function exportStandard(query) {
-    return request({
-        url: '/benyi/dayflow/standard/export',
-        method: 'get',
-        params: query
-    })
-}
\ No newline at end of file
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 88a1f1aea..75c88b92a 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -90,30 +90,30 @@ export const constantRoutes = [{
             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: '/dayflow',
-    //     component: Layout,
-    //     hidden: true,
-    //     children: [{
-    //         path: 'dayflowmanger/dayflowtask/standard/:code(\\d+)',
-    //         component: () =>
-    //             import ('@/views/benyi/dayflow/standard'),
-    //         name: 'Standard',
-    //         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: '/dayflow/dayflowmanger',
+        component: Layout,
+        hidden: true,
+        children: [{
+            path: 'dayflowtask/standard/:code(\\d+)',
+            component: () =>
+                import ('@/views/benyi/dayflow/standard'),
+            name: 'Standard',
+            meta: { title: '一日流程标准', icon: '' }
+        }]
+    },
     {
         path: '/job',
         component: Layout,
diff --git a/ruoyi-ui/src/views/benyi/dayflow/index.vue b/ruoyi-ui/src/views/benyi/dayflow/index.vue
index 68af177ea..28db9e6de 100644
--- a/ruoyi-ui/src/views/benyi/dayflow/index.vue
+++ b/ruoyi-ui/src/views/benyi/dayflow/index.vue
@@ -128,7 +128,6 @@
               v-for="dict in dayflowtypeOptions"
               :key="dict.dictValue"
               :label="dict.dictLabel"
-              :value="dict.dictValue"
             />
           </el-select>
         </el-form-item>
diff --git a/ruoyi-ui/src/views/benyi/dayflow/standard.vue b/ruoyi-ui/src/views/benyi/dayflow/standard.vue
index 2dc0a379f..154cb633e 100644
--- a/ruoyi-ui/src/views/benyi/dayflow/standard.vue
+++ b/ruoyi-ui/src/views/benyi/dayflow/standard.vue
@@ -144,7 +144,7 @@
 </template>
 
 <script>
-import { listStandard, getStandard, delStandard, addStandard, updateStandard, exportStandard } from "@/api/benyi/dayflow/standard";
+import { listStandard, getStandard, delStandard, addStandard, updateStandard, exportStandard } from "@/api/benyi/dayflow/biaozhun/standard";
 import { listDayflowtask, getDayflowtask } from "@/api/benyi/dayflow/dayflowtask";
 
 export default {
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayFlowStandardController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayFlowStandardController.java
index cf8aef44d..f831849c7 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayFlowStandardController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayFlowStandardController.java
@@ -30,7 +30,7 @@ import com.ruoyi.framework.web.page.TableDataInfo;
  * @date 2020-05-18
  */
 @RestController
-@RequestMapping("/benyi/dayflow/standard")
+@RequestMapping("/benyi/dayflow/biaozhun/standard")
 public class ByDayFlowStandardController extends BaseController
 {
     @Autowired
diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByDayFlowDetailMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByDayFlowDetailMapper.xml
index 81adc2134..da5ff863e 100644
--- a/ruoyi/src/main/resources/mybatis/benyi/ByDayFlowDetailMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/ByDayFlowDetailMapper.xml
@@ -19,7 +19,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectByDayFlowDetailVo">
-        select id, sort_number, target_count, name, content, note, flow_type, create_user, update_user, create_time, update_time from by_day_flow_detail
+        select id, sort_number, target_count, name, content, note, flow_type, create_user, update_user, create_time, update_time
+        from by_day_flow_detail
     </sql>
 
     <select id="selectByDayFlowDetailList" parameterType="ByDayFlowDetail" resultMap="ByDayFlowDetailResult">