From ff066fb8d926d9a75efdcfdfc1b37f890cd98d82 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 14 Aug 2021 16:02:39 +0800
Subject: [PATCH] 解决冲突

---
 src/views/applyexam/index.vue             |  107 
 src/views/resource/attachCopy.vue         |   67 
 src/router/views/index.js                 | 1745 +++++++++++----------
 src/views/traincompany/index.vue          |    3 
 src/views/trainExam/performance.vue       |  492 ++++++
 public/papers.html                        |    4 
 src/views/ownerFeedback/owner.vue         |  287 +++
 src/views/trainExam/singleperformance.vue |  423 +++++
 src/api/owner/owner.js                    |   61 
 public/papersApply.html                   |    4 
 src/styles/common.scss                    |   38 
 src/views/companyApply/index.vue          |  130 +
 src/api/securityGuard/securityGuard.js    |    7 
 src/views/resource/uploadNotice.vue       |  697 ++++----
 src/views/resource/attach.vue             |  679 ++++----
 src/views/exam/performance.vue            |    4 
 src/views/exam/singleperformance.vue      |    2 
 17 files changed, 3,111 insertions(+), 1,639 deletions(-)

diff --git a/public/papers.html b/public/papers.html
index b39f705..dfe0ad7 100644
--- a/public/papers.html
+++ b/public/papers.html
@@ -121,8 +121,8 @@
             var examType = JSON.parse(getData("data")).examType;
             // console.log(JSON.parse(getData("data")), 111);
 
-            // axios.get('http://223.82.109.183:2080/apply/getApplyInfo?id=' + id + "&applyExamType=" + examType).then(function(res) {
-            axios.get('http://localhost:81/apply/getApplyInfo?id=' + id + "&applyExamType=" + examType).then(function(res) {
+            axios.get('http://223.82.109.183:2080/apply/getApplyInfo?id=' + id + "&applyExamType=" + examType).then(function(res) {
+                // axios.get('http://localhost:81/apply/getApplyInfo?id=' + id + "&applyExamType=" + examType).then(function(res) {
                 var data = res.data.data;
                 var str = `<span class="title">${data.examName}</span>
                     <span class="title">准考证信息</span>
diff --git a/public/papersApply.html b/public/papersApply.html
index 3682b04..a3300db 100644
--- a/public/papersApply.html
+++ b/public/papersApply.html
@@ -77,8 +77,8 @@
             var name = JSON.parse(getData("data")).name;
             // console.log(JSON.parse(getData("data")), 111);
 
-            // axios.get('http://223.82.109.183:2080/apply/getApplyDetailList?examId=' + id).then(function(res) {
-            axios.get('http://localhost:81/apply/getApplyDetailList?examId=' + id).then(function(res) {
+            axios.get('http://223.82.109.183:2080/apply/getApplyDetailList?examId=' + id).then(function(res) {
+                // axios.get('http://localhost:81/apply/getApplyDetailList?examId=' + id).then(function(res) {
                 var data = res.data;
                 var list = data.applyList;
                 console.log(data, 123);
diff --git a/src/api/owner/owner.js b/src/api/owner/owner.js
new file mode 100644
index 0000000..a931aae
--- /dev/null
+++ b/src/api/owner/owner.js
@@ -0,0 +1,61 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+    return request({
+        url: '/api/owner/page',
+        method: 'get',
+        params: {
+            ...params,
+            current,
+            size,
+        }
+    })
+}
+
+export const getListPage = (current, size, params) => {
+    return request({
+        url: '/api/owner/page',
+        method: 'get',
+        params: {
+            ...params,
+            current,
+            size,
+        }
+    })
+}
+
+export const remove = (ids) => {
+    return request({
+        url: '/api/owner/remove',
+        method: 'post',
+        params: {
+            ids,
+        }
+    })
+}
+
+export const add = (row) => {
+    return request({
+        url: '/api/owner/submit',
+        method: 'post',
+        data: row
+    })
+}
+
+export const update = (row) => {
+    return request({
+        url: '/api/owner/submit',
+        method: 'post',
+        data: row
+    })
+}
+
+export const getNotice = (id) => {
+    return request({
+        url: '/api/owner/detail',
+        method: 'get',
+        params: {
+            id
+        }
+    })
+}
diff --git a/src/api/securityGuard/securityGuard.js b/src/api/securityGuard/securityGuard.js
index b9a409b..97a0d98 100644
--- a/src/api/securityGuard/securityGuard.js
+++ b/src/api/securityGuard/securityGuard.js
@@ -43,11 +43,14 @@
 }
 
 
-export const addBatchApply = (row) => {
+export const addBatchApply = (ids, deptId) => {
     return request({
         url: '/api/apply/batchApply',
         method: 'post',
-        data: row
+        params: {
+            ids,
+            deptId
+        }
     })
 }
 
diff --git a/src/router/views/index.js b/src/router/views/index.js
index faf5dbb..48ab3f9 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -1,873 +1,888 @@
 import Layout from '@/page/index/'
 
 export default [{
-        path: '/wel',
-        component: Layout,
-        redirect: '/wel/index',
-        children: [{
-            path: 'index',
-            name: '首页',
-            meta: {
-                i18n: 'dashboard'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/wel/index')
-        }, {
-            path: 'dashboard',
-            name: '控制台',
-            meta: {
-                i18n: 'dashboard',
-                menu: false,
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/wel/dashboard')
-        }]
-    }, {
-        path: '/test',
-        component: Layout,
-        redirect: '/test/index',
-        children: [{
-            path: 'index',
-            name: '测试页',
-            meta: {
-                i18n: 'test'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/util/test')
-        }]
-    }, {
-        path: '/dict-horizontal',
-        component: Layout,
-        redirect: '/dict-horizontal/index',
-        children: [{
-            path: 'index',
-            name: '字典管理',
-            meta: {
-                i18n: 'dict'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal')
-        }]
-    }, {
-        path: '/dict-vertical',
-        component: Layout,
-        redirect: '/dict-vertical/index',
-        children: [{
-            path: 'index',
-            name: '字典管理',
-            meta: {
-                i18n: 'dict'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical')
-        }]
-    }, {
-        path: '/info',
-        component: Layout,
-        redirect: '/info/index',
-        children: [{
-            path: 'index',
-            name: '个人信息',
-            meta: {
-                i18n: 'info'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/system/userinfo')
-        }]
-    }, {
-        path: '/work/process/leave',
-        component: Layout,
-        redirect: '/work/process/leave/form',
-        children: [{
-            path: 'form/:processDefinitionId',
-            name: '请假流程',
-            meta: {
-                i18n: 'work'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/form')
-        }, {
-            path: 'handle/:taskId/:processInstanceId/:businessId',
-            name: '处理请假流程',
-            meta: {
-                i18n: 'work'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle')
-        }, {
-            path: 'detail/:processInstanceId/:businessId',
-            name: '请假流程详情',
-            meta: {
-                i18n: 'work'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
-        }]
-    }, {
-        path: '/securityAnalysis',
-        component: Layout,
-        redirect: '/securityAnalysis/index',
-        children: [{
-            path: 'index',
-            name: '保安单位情况智能分析',
-            meta: {
-                i18n: 'dict'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/securityAnalysis/index')
-        }]
-    }, {
-        path: '/recruitmentManagement',
-        component: Layout,
-        redirect: '/recruitmentManagement/index',
-        children: [{
-            path: 'index',
-            name: '招聘管理',
-            meta: {
-                i18n: 'dict'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/recruitmentManagement/index')
-        }]
-    }, {
-        path: '/securityUnit',
-        component: Layout,
-        redirect: '/securityUnit/index',
-        children: [{
-            path: 'index',
-            name: '保安单位信息',
-            meta: {
-                i18n: 'dict'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/securityUnit/index')
-        }]
-    }, {
-        path: '/securityGuard',
-        component: Layout,
-        redirect: '/securityGuard/securityGuard',
-        children: [{
-            path: 'index',
-            name: '保安员查询',
-            meta: {
-                i18n: 'dict'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuard')
-        }]
-    }, {
-        path: '/securityGuardDetail',
-        component: Layout,
-        redirect: '/securityGuardDetail/index',
-        children: [{
-            path: 'index',
-            name: '保安员详情',
-            meta: {
-                i18n: 'dict'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuardDetail')
-        }]
-    }, {
-        path: '/resource',
-        component: Layout,
-        redirect: '/resource/attach',
-        children: [{
-            path: 'attach',
-            name: '附件上传',
-            meta: {
-                i18n: 'dict'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/resource/attach')
-        }]
-    }, {
-        path: '/securityUnitChild',
-        component: Layout,
-        redirect: '/securityUnitChild/index',
-        children: [{
-            path: 'index',
-            name: '保安单位详情',
-            meta: {
-                i18n: 'dict'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/securityUnitChild/index')
-        }]
-    }, {
-        path: '/securityGuard',
-        component: Layout,
-        redirect: '/securityGuard/securityGuard',
-        children: [{
-            path: 'index',
-            name: '保安员管理',
-            meta: {
-                i18n: 'dict'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuard')
-        }]
+  path: '/wel',
+  component: Layout,
+  redirect: '/wel/index',
+  children: [{
+    path: 'index',
+    name: '首页',
+    meta: {
+      i18n: 'dashboard'
     },
-    // {
-    //     path: '/dispatch/dispatch',
-    //     component: Layout,
-    //     redirect: '/dispatch/dispatch',
-    //     children: [{
-    //         path: 'index',
-    //         name: '派遣服务管理',
-    //         meta: {
-    //             i18n: 'dict'
-    //         },
-    //         component: () =>
-    //             import( /* webpackChunkName: "views" */ '@/views/dispatch/dispatch')
-    //     }]
-    // },
-    {
-        path: '/desk',
-        component: Layout,
-        redirect: '/desk/notice',
-        children: [{
-            path: 'index',
-            name: '通知公告',
-            meta: {
-                i18n: 'dict'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/desk/notice')
-        }]
+    component: () =>
+      import ( /* webpackChunkName: "views" */ '@/views/wel/index')
+  }, {
+    path: 'dashboard',
+    name: '控制台',
+    meta: {
+      i18n: 'dashboard',
+      menu: false,
     },
-    {
-        path: '/talk',
-        component: Layout,
-        redirect: '/talk/talk',
-        children: [{
-            path: 'index',
-            name: '心里咨询',
-            meta: {
-                i18n: 'dict'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/talk/talk')
-        }]
+    component: () =>
+      import ( /* webpackChunkName: "views" */ '@/views/wel/dashboard')
+  }]
+}, {
+  path: '/test',
+  component: Layout,
+  redirect: '/test/index',
+  children: [{
+    path: 'index',
+    name: '测试页',
+    meta: {
+      i18n: 'test'
     },
-    {
-        path: '/workreport',
-        component: Layout,
-        redirect: '/workreport/workreport',
-        children: [{
-            path: 'workreport',
-            name: '发起的汇报',
-            meta: {
-                i18n: 'dict'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/workreport/workreport')
-        }]
+    component: () =>
+      import ( /* webpackChunkName: "views" */ '@/views/util/test')
+  }]
+}, {
+  path: '/dict-horizontal',
+  component: Layout,
+  redirect: '/dict-horizontal/index',
+  children: [{
+    path: 'index',
+    name: '字典管理',
+    meta: {
+      i18n: 'dict'
     },
-    {
-        path: '/workreport',
-        component: Layout,
-        redirect: '/workreport/workreply',
-        children: [{
-            path: 'workreply',
-            name: '接收的汇报',
-            meta: {
-                i18n: 'dict'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/workreport/workreply')
-        }]
+    component: () =>
+      import ( /* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal')
+  }]
+}, {
+  path: '/dict-vertical',
+  component: Layout,
+  redirect: '/dict-vertical/index',
+  children: [{
+    path: 'index',
+    name: '字典管理',
+    meta: {
+      i18n: 'dict'
+    },
+    component: () =>
+      import ( /* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical')
+  }]
+}, {
+  path: '/info',
+  component: Layout,
+  redirect: '/info/index',
+  children: [{
+    path: 'index',
+    name: '个人信息',
+    meta: {
+      i18n: 'info'
+    },
+    component: () =>
+      import ( /* webpackChunkName: "views" */ '@/views/system/userinfo')
+  }]
+}, {
+  path: '/work/process/leave',
+  component: Layout,
+  redirect: '/work/process/leave/form',
+  children: [{
+    path: 'form/:processDefinitionId',
+    name: '请假流程',
+    meta: {
+      i18n: 'work'
+    },
+    component: () =>
+      import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/form')
+  }, {
+    path: 'handle/:taskId/:processInstanceId/:businessId',
+    name: '处理请假流程',
+    meta: {
+      i18n: 'work'
+    },
+    component: () =>
+      import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle')
+  }, {
+    path: 'detail/:processInstanceId/:businessId',
+    name: '请假流程详情',
+    meta: {
+      i18n: 'work'
+    },
+    component: () =>
+      import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
+  }]
+}, {
+  path: '/securityAnalysis',
+  component: Layout,
+  redirect: '/securityAnalysis/index',
+  children: [{
+    path: 'index',
+    name: '保安单位情况智能分析',
+    meta: {
+      i18n: 'dict'
+    },
+    component: () =>
+      import ( /* webpackChunkName: "views" */ '@/views/securityAnalysis/index')
+  }]
+}, {
+  path: '/recruitmentManagement',
+  component: Layout,
+  redirect: '/recruitmentManagement/index',
+  children: [{
+    path: 'index',
+    name: '招聘管理',
+    meta: {
+      i18n: 'dict'
+    },
+    component: () =>
+      import ( /* webpackChunkName: "views" */ '@/views/recruitmentManagement/index')
+  }]
+}, {
+  path: '/securityUnit',
+  component: Layout,
+  redirect: '/securityUnit/index',
+  children: [{
+    path: 'index',
+    name: '保安单位信息',
+    meta: {
+      i18n: 'dict'
+    },
+    component: () =>
+      import ( /* webpackChunkName: "views" */ '@/views/securityUnit/index')
+  }]
+}, {
+  path: '/securityGuard',
+  component: Layout,
+  redirect: '/securityGuard/securityGuard',
+  children: [{
+    path: 'index',
+    name: '保安员查询',
+    meta: {
+      i18n: 'dict'
+    },
+    component: () =>
+      import ( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuard')
+  }]
+}, {
+  path: '/securityGuardDetail',
+  component: Layout,
+  redirect: '/securityGuardDetail/index',
+  children: [{
+    path: 'index',
+    name: '保安员详情',
+    meta: {
+      i18n: 'dict'
+    },
+    component: () =>
+      import ( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuardDetail')
+  }]
+}, {
+  path: '/resource',
+  component: Layout,
+  redirect: '/resource/attach',
+  children: [{
+    path: 'attach',
+    name: '附件上传',
+    meta: {
+      i18n: 'dict'
+    },
+    component: () =>
+      import ( /* webpackChunkName: "views" */ '@/views/resource/attach')
+  }]
+}, {
+  path: '/securityUnitChild',
+  component: Layout,
+  redirect: '/securityUnitChild/index',
+  children: [{
+    path: 'index',
+    name: '保安单位详情',
+    meta: {
+      i18n: 'dict'
+    },
+    component: () =>
+      import ( /* webpackChunkName: "views" */ '@/views/securityUnitChild/index')
+  }]
+}, {
+  path: '/securityGuard',
+  component: Layout,
+  redirect: '/securityGuard/securityGuard',
+  children: [{
+    path: 'index',
+    name: '保安员管理',
+    meta: {
+      i18n: 'dict'
+    },
+    component: () =>
+      import ( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuard')
+  }]
+},
+  // {
+  //     path: '/dispatch/dispatch',
+  //     component: Layout,
+  //     redirect: '/dispatch/dispatch',
+  //     children: [{
+  //         path: 'index',
+  //         name: '派遣服务管理',
+  //         meta: {
+  //             i18n: 'dict'
+  //         },
+  //         component: () =>
+  //             import( /* webpackChunkName: "views" */ '@/views/dispatch/dispatch')
+  //     }]
+  // },
+  {
+    path: '/desk',
+    component: Layout,
+    redirect: '/desk/notice',
+    children: [{
+      path: 'index',
+      name: '通知公告',
+      meta: {
+        i18n: 'dict'
+      },
+      component: () =>
+        import ( /* webpackChunkName: "views" */ '@/views/desk/notice')
+    }]
+  },
+  {
+    path: '/talk',
+    component: Layout,
+    redirect: '/talk/talk',
+    children: [{
+      path: 'index',
+      name: '心里咨询',
+      meta: {
+        i18n: 'dict'
+      },
+      component: () =>
+        import ( /* webpackChunkName: "views" */ '@/views/talk/talk')
+    }]
+  },
+  {
+    path: '/workreport',
+    component: Layout,
+    redirect: '/workreport/workreport',
+    children: [{
+      path: 'workreport',
+      name: '发起的汇报',
+      meta: {
+        i18n: 'dict'
+      },
+      component: () =>
+        import ( /* webpackChunkName: "views" */ '@/views/workreport/workreport')
+    }]
+  },
+  {
+    path: '/workreport',
+    component: Layout,
+    redirect: '/workreport/workreply',
+    children: [{
+      path: 'workreply',
+      name: '接收的汇报',
+      meta: {
+        i18n: 'dict'
+      },
+      component: () =>
+        import ( /* webpackChunkName: "views" */ '@/views/workreport/workreply')
+    }]
+  }, {
+    path: '/resource',
+    component: Layout,
+    redirect: '/resource/attachCopy',
+    children: [{
+      path: 'attachCopy',
+      name: '保安单位附件上传',
+      meta: {
+        i18n: 'dict'
+      },
+      component: () =>
+        import ( /* webpackChunkName: "views" */ '@/views/resource/attachCopy')
+    }]
+  },
+  // {
+  //     path: '/dispatch',
+  //     component: Layout,
+  //     redirect: '/dispatch/dispatch',
+  //     children: [{
+  //         path: 'dispatch',
+  //         name: '派遣单位管理',
+  //         meta: {
+  //             i18n: 'dispatch'
+  //         },
+  //         component: () =>
+  //             import( /* webpackChunkName: "views" */ '@/views/dispatch/dispatch')
+  //     }, {
+  //         path: 'dispatchChildoperable',
+  //         name: '派遣记录管理',
+  //         meta: {
+  //             i18n: 'dispatch'
+  //         },
+  //         component: () =>
+  //             import( /* webpackChunkName: "views" */ '@/views/dispatch/dispatchChildoperable')
+  //     }]
+  // },
+  // {
+  //     path: '/dispatchChild',
+  //     component: Layout,
+  //     redirect: '/dispatchChild/index',
+  //     children: [{
+  //         path: 'index',
+  //         name: '派遣服务记录',
+  //         meta: {
+  //             i18n: 'dict'
+  //         },
+  //         component: () =>
+  //             import( /* webpackChunkName: "views" */ '@/views/dispatchChild/index')
+  //     }]
+  // },
+  // {
+  //     path: '/equipments',
+  //     component: Layout,
+  //     redirect: '/equipments/index',
+  //     children: [{
+  //         path: 'index',
+  //         name: '保安公司装备管理',
+  //         meta: {
+  //             i18n: 'dict'
+  //         },
+  //         component: () =>
+  //             import( /* webpackChunkName: "views" */ '@/views/equipments/index')
+  //     }]
+  // }, {
+  //     path: '/car',
+  //     component: Layout,
+  //     redirect: '/car/index',
+  //     children: [{
+  //         path: 'index',
+  //         name: '保安公司车辆管理',
+  //         meta: {
+  //             i18n: 'dict'
+  //         },
+  //         component: () =>
+  //             import( /* webpackChunkName: "views" */ '@/views/car/index')
+  //     }]
+  // }, {
+  //     path: '/gun',
+  //     component: Layout,
+  //     redirect: '/gun/index',
+  //     children: [{
+  //         path: 'index',
+  //         name: '保安公司枪支管理',
+  //         meta: {
+  //             i18n: 'dict'
+  //         },
+  //         component: () =>
+  //             import( /* webpackChunkName: "views" */ '@/views/gun/index')
+  //     }]
+  // },
+  // {
+  //     path: '/securityEquipment',
+  //     component: Layout,
+  //     redirect: '/securityEquipment',
+  //     children: [{
+  //         path: 'equipments',
+  //         name: '装备管理',
+  //         meta: {
+  //             i18n: 'securityEquipment'
+  //         },
+  //         component: () =>
+  //             import( /* webpackChunkName: "views" */ '@/views/securityEquipment/equipments')
+  //     }, {
+  //         path: 'car',
+  //         name: '车辆管理',
+  //         meta: {
+  //             i18n: 'car'
+  //         },
+  //         component: () =>
+  //             import( /* webpackChunkName: "views" */ '@/views/securityEquipment/car')
+  //     }, {
+  //         path: 'gun',
+  //         name: '车辆管理',
+  //         meta: {
+  //             i18n: 'gun'
+  //         },
+  //         component: () =>
+  //             import( /* webpackChunkName: "views" */ '@/views/securityEquipment/gun')
+  //     }]
+  // },
+  // {
+  //     path: '/trainingRegistration',
+  //     component: Layout,
+  //     redirect: '/trainingRegistration/index',
+  //     children: [{
+  //         path: 'index',
+  //         name: '保安培训报名管理',
+  //         meta: {
+  //             i18n: 'dict'
+  //         },
+  //         component: () =>
+  //             import ( /* webpackChunkName: "views" */ '@/views/trainingRegistration/index')
+  //     }]
+  // },
+  {
+    path: '/securityAnalysis',
+    component: Layout,
+    redirect: '/securityAnalysis/index',
+    children: [{
+      path: 'index',
+      name: '保安单位情况智能分析',
+      meta: {
+        i18n: 'dict'
+      },
+      component: () =>
+        import ( /* webpackChunkName: "views" */ '@/views/securityAnalysis/index')
+    }]
+  }, {
+    path: '/recruitmentManagement',
+    component: Layout,
+    redirect: '/recruitmentManagement/index',
+    children: [{
+      path: 'index',
+      name: '招聘管理',
+      meta: {
+        i18n: 'dict'
+      },
+      component: () =>
+        import ( /* webpackChunkName: "views" */ '@/views/recruitmentManagement/index')
+    }]
+  }
+  , {
+    path: '/ownerFeedback',
+    component: Layout,
+    redirect: '/ownerFeedback/index',
+    children: [{
+      path: 'index',
+      name: '业主反馈',
+      meta: {
+        i18n: 'dict'
+      },
+      component: () =>
+        import ( /* webpackChunkName: "views" */ '@/views/ownerFeedback/owner')
+    }]
+  }
+  , {
+    path: '/securityUnit',
+    component: Layout,
+    redirect: '/securityUnit/index',
+    children: [{
+      path: 'index',
+      name: '保安单位信息',
+      meta: {
+        i18n: 'dict'
+      },
+      component: () =>
+        import ( /* webpackChunkName: "views" */ '@/views/securityUnit/index')
+    }]
+  }, {
+    path: '/securityGuard',
+    component: Layout,
+    redirect: '/securityGuard/securityGuard',
+    children: [{
+      path: 'index',
+      name: '保安员查询',
+      meta: {
+        i18n: 'dict'
+      },
+      component: () =>
+        import ( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuard')
+    }]
+  }, {
+    path: '/securityGuardDetail',
+    component: Layout,
+    redirect: '/securityGuardDetail/index',
+    children: [{
+      path: 'index',
+      name: '保安员详情',
+      meta: {
+        i18n: 'dict'
+      },
+      component: () =>
+        import ( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuardDetail')
+    }]
+  }, {
+    path: '/resource',
+    component: Layout,
+    redirect: '/resource/attach',
+    children: [{
+      path: 'attach',
+      name: '附件上传',
+      meta: {
+        i18n: 'dict'
+      },
+      component: () =>
+        import ( /* webpackChunkName: "views" */ '@/views/resource/attach')
+    }]
+  }, {
+    path: '/securityUnitChild',
+    component: Layout,
+    redirect: '/securityUnitChild/index',
+    children: [{
+      path: 'index',
+      name: '保安单位详情',
+      meta: {
+        i18n: 'dict'
+      },
+      component: () =>
+        import ( /* webpackChunkName: "views" */ '@/views/securityUnitChild/index')
+    }]
+  }, {
+    path: '/securityGuard',
+    component: Layout,
+    redirect: '/securityGuard/securityGuard',
+    children: [{
+      path: 'index',
+      name: '保安员管理',
+      meta: {
+        i18n: 'dict'
+      },
+      component: () =>
+        import ( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuard')
+    }]
+  },
+  // {
+  //     path: '/dispatch/dispatch',
+  //     component: Layout,
+  //     redirect: '/dispatch/dispatch',
+  //     children: [{
+  //         path: 'index',
+  //         name: '派遣服务管理',
+  //         meta: {
+  //             i18n: 'dict'
+  //         },
+  //         component: () =>
+  //             import( /* webpackChunkName: "views" */ '@/views/dispatch/dispatch')
+  //     }]
+  // },
+  {
+    path: '/desk',
+    component: Layout,
+    redirect: '/desk/notice',
+    children: [{
+      path: 'index',
+      name: '通知公告',
+      meta: {
+        i18n: 'dict'
+      },
+      component: () =>
+        import ( /* webpackChunkName: "views" */ '@/views/desk/notice')
+    }]
+  }, {
+    path: '/dispatch',
+    component: Layout,
+    redirect: '/dispatch/dispatch',
+    children: [{
+      path: 'dispatch',
+      name: '派遣单位管理',
+      meta: {
+        i18n: 'dispatch'
+      },
+      component: () =>
+        import ( /* webpackChunkName: "views" */ '@/views/dispatch/dispatch')
     }, {
-        path: '/resource',
-        component: Layout,
-        redirect: '/resource/attachCopy',
-        children: [{
-            path: 'attachCopy',
-            name: '保安单位附件上传',
-            meta: {
-                i18n: 'dict'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/resource/attachCopy')
-        }]
-    },
-    // {
-    //     path: '/dispatch',
-    //     component: Layout,
-    //     redirect: '/dispatch/dispatch',
-    //     children: [{
-    //         path: 'dispatch',
-    //         name: '派遣单位管理',
-    //         meta: {
-    //             i18n: 'dispatch'
-    //         },
-    //         component: () =>
-    //             import( /* webpackChunkName: "views" */ '@/views/dispatch/dispatch')
-    //     }, {
-    //         path: 'dispatchChildoperable',
-    //         name: '派遣记录管理',
-    //         meta: {
-    //             i18n: 'dispatch'
-    //         },
-    //         component: () =>
-    //             import( /* webpackChunkName: "views" */ '@/views/dispatch/dispatchChildoperable')
-    //     }]
-    // },
-    // {
-    //     path: '/dispatchChild',
-    //     component: Layout,
-    //     redirect: '/dispatchChild/index',
-    //     children: [{
-    //         path: 'index',
-    //         name: '派遣服务记录',
-    //         meta: {
-    //             i18n: 'dict'
-    //         },
-    //         component: () =>
-    //             import( /* webpackChunkName: "views" */ '@/views/dispatchChild/index')
-    //     }]
-    // },
-    // {
-    //     path: '/equipments',
-    //     component: Layout,
-    //     redirect: '/equipments/index',
-    //     children: [{
-    //         path: 'index',
-    //         name: '保安公司装备管理',
-    //         meta: {
-    //             i18n: 'dict'
-    //         },
-    //         component: () =>
-    //             import( /* webpackChunkName: "views" */ '@/views/equipments/index')
-    //     }]
-    // }, {
-    //     path: '/car',
-    //     component: Layout,
-    //     redirect: '/car/index',
-    //     children: [{
-    //         path: 'index',
-    //         name: '保安公司车辆管理',
-    //         meta: {
-    //             i18n: 'dict'
-    //         },
-    //         component: () =>
-    //             import( /* webpackChunkName: "views" */ '@/views/car/index')
-    //     }]
-    // }, {
-    //     path: '/gun',
-    //     component: Layout,
-    //     redirect: '/gun/index',
-    //     children: [{
-    //         path: 'index',
-    //         name: '保安公司枪支管理',
-    //         meta: {
-    //             i18n: 'dict'
-    //         },
-    //         component: () =>
-    //             import( /* webpackChunkName: "views" */ '@/views/gun/index')
-    //     }]
-    // },
-    // {
-    //     path: '/securityEquipment',
-    //     component: Layout,
-    //     redirect: '/securityEquipment',
-    //     children: [{
-    //         path: 'equipments',
-    //         name: '装备管理',
-    //         meta: {
-    //             i18n: 'securityEquipment'
-    //         },
-    //         component: () =>
-    //             import( /* webpackChunkName: "views" */ '@/views/securityEquipment/equipments')
-    //     }, {
-    //         path: 'car',
-    //         name: '车辆管理',
-    //         meta: {
-    //             i18n: 'car'
-    //         },
-    //         component: () =>
-    //             import( /* webpackChunkName: "views" */ '@/views/securityEquipment/car')
-    //     }, {
-    //         path: 'gun',
-    //         name: '车辆管理',
-    //         meta: {
-    //             i18n: 'gun'
-    //         },
-    //         component: () =>
-    //             import( /* webpackChunkName: "views" */ '@/views/securityEquipment/gun')
-    //     }]
-    // },
-    // {
-    //     path: '/trainingRegistration',
-    //     component: Layout,
-    //     redirect: '/trainingRegistration/index',
-    //     children: [{
-    //         path: 'index',
-    //         name: '保安培训报名管理',
-    //         meta: {
-    //             i18n: 'dict'
-    //         },
-    //         component: () =>
-    //             import ( /* webpackChunkName: "views" */ '@/views/trainingRegistration/index')
-    //     }]
-    // }, 
-    {
-        path: '/securityAnalysis',
-        component: Layout,
-        redirect: '/securityAnalysis/index',
-        children: [{
-            path: 'index',
-            name: '保安单位情况智能分析',
-            meta: {
-                i18n: 'dict'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/securityAnalysis/index')
-        }]
-    }, {
-        path: '/recruitmentManagement',
-        component: Layout,
-        redirect: '/recruitmentManagement/index',
-        children: [{
-            path: 'index',
-            name: '招聘管理',
-            meta: {
-                i18n: 'dict'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/recruitmentManagement/index')
-        }]
-    }, {
-        path: '/securityUnit',
-        component: Layout,
-        redirect: '/securityUnit/index',
-        children: [{
-            path: 'index',
-            name: '保安单位信息',
-            meta: {
-                i18n: 'dict'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/securityUnit/index')
-        }]
-    }, {
-        path: '/securityGuard',
-        component: Layout,
-        redirect: '/securityGuard/securityGuard',
-        children: [{
-            path: 'index',
-            name: '保安员查询',
-            meta: {
-                i18n: 'dict'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuard')
-        }]
-    }, {
-        path: '/securityGuardDetail',
-        component: Layout,
-        redirect: '/securityGuardDetail/index',
-        children: [{
-            path: 'index',
-            name: '保安员详情',
-            meta: {
-                i18n: 'dict'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuardDetail')
-        }]
-    }, {
-        path: '/resource',
-        component: Layout,
-        redirect: '/resource/attach',
-        children: [{
-            path: 'attach',
-            name: '附件上传',
-            meta: {
-                i18n: 'dict'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/resource/attach')
-        }]
-    }, {
-        path: '/securityUnitChild',
-        component: Layout,
-        redirect: '/securityUnitChild/index',
-        children: [{
-            path: 'index',
-            name: '保安单位详情',
-            meta: {
-                i18n: 'dict'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/securityUnitChild/index')
-        }]
-    }, {
-        path: '/securityGuard',
-        component: Layout,
-        redirect: '/securityGuard/securityGuard',
-        children: [{
-            path: 'index',
-            name: '保安员管理',
-            meta: {
-                i18n: 'dict'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuard')
-        }]
-    },
-    // {
-    //     path: '/dispatch/dispatch',
-    //     component: Layout,
-    //     redirect: '/dispatch/dispatch',
-    //     children: [{
-    //         path: 'index',
-    //         name: '派遣服务管理',
-    //         meta: {
-    //             i18n: 'dict'
-    //         },
-    //         component: () =>
-    //             import( /* webpackChunkName: "views" */ '@/views/dispatch/dispatch')
-    //     }]
-    // },
-    {
-        path: '/desk',
-        component: Layout,
-        redirect: '/desk/notice',
-        children: [{
-            path: 'index',
-            name: '通知公告',
-            meta: {
-                i18n: 'dict'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/desk/notice')
-        }]
-    }, {
-        path: '/dispatch',
-        component: Layout,
-        redirect: '/dispatch/dispatch',
-        children: [{
-            path: 'dispatch',
-            name: '派遣单位管理',
-            meta: {
-                i18n: 'dispatch'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/dispatch/dispatch')
-        }, {
-            path: 'dispatchChildoperable',
-            name: '派遣记录管理',
-            meta: {
-                i18n: 'dispatch'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/dispatch/dispatchChildoperable')
-        }]
-    }, {
-        path: '/dispatchChild',
-        component: Layout,
-        redirect: '/dispatchChild/index',
-        children: [{
-            path: 'index',
-            name: '派遣服务记录',
-            meta: {
-                i18n: 'dict'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/dispatchChild/index')
-        }]
-    }, {
-        path: '/applyexam',
-        redirect: '/applyexam/papers',
-        component: Layout,
-        children: [{
-            path: 'papers',
-            name: '准考证信息',
-            meta: {
-                i18n: 'index',
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/applyexam/papers')
-        }]
-    },
-    // {
-    //     path: '/equipments',
-    //     component: Layout,
-    //     redirect: '/equipments/index',
-    //     children: [{
-    //         path: 'index',
-    //         name: '保安公司装备管理',
-    //         meta: {
-    //             i18n: 'dict'
-    //         },
-    //         component: () =>
-    //             import( /* webpackChunkName: "views" */ '@/views/equipments/index')
-    //     }]
-    // }, {
-    //     path: '/car',
-    //     component: Layout,
-    //     redirect: '/car/index',
-    //     children: [{
-    //         path: 'index',
-    //         name: '保安公司车辆管理',
-    //         meta: {
-    //             i18n: 'dict'
-    //         },
-    //         component: () =>
-    //             import( /* webpackChunkName: "views" */ '@/views/car/index')
-    //     }]
-    // }, {
-    //     path: '/gun',
-    //     component: Layout,
-    //     redirect: '/gun/index',
-    //     children: [{
-    //         path: 'index',
-    //         name: '保安公司枪支管理',
-    //         meta: {
-    //             i18n: 'dict'
-    //         },
-    //         component: () =>
-    //             import( /* webpackChunkName: "views" */ '@/views/gun/index')
-    //     }]
-    // },
-    // {
-    //     path: '/securityEquipment',
-    //     component: Layout,
-    //     redirect: '/securityEquipment',
-    //     children: [{
-    //         path: 'equipments',
-    //         name: '装备管理',
-    //         meta: {
-    //             i18n: 'securityEquipment'
-    //         },
-    //         component: () =>
-    //             import( /* webpackChunkName: "views" */ '@/views/securityEquipment/equipments')
-    //     }, {
-    //         path: 'car',
-    //         name: '车辆管理',
-    //         meta: {
-    //             i18n: 'car'
-    //         },
-    //         component: () =>
-    //             import( /* webpackChunkName: "views" */ '@/views/securityEquipment/car')
-    //     }, {
-    //         path: 'gun',
-    //         name: '车辆管理',
-    //         meta: {
-    //             i18n: 'gun'
-    //         },
-    //         component: () =>
-    //             import( /* webpackChunkName: "views" */ '@/views/securityEquipment/gun')
-    //     }]
-    // },
-    // {
-    //     path: '/trainingRegistration',
-    //     component: Layout,
-    //     redirect: '/trainingRegistration/index',
-    //     children: [{
-    //         path: 'index',
-    //         name: '保安培训报名',
-    //         meta: {
-    //             i18n: 'dict'
-    //         },
-    //         component: () =>
-    //             import ( /* webpackChunkName: "views" */ '@/views/trainingRegistration/index')
-    //     }]
-    // },
-    // {
-    //     path: '/trainExam',
-    //     component: Layout,
-    //     redirect: '/trainExam/index',
-    //     children: [{
-    //         path: 'index',
-    //         name: '考试申请',
-    //         meta: {
-    //             i18n: 'dict'
-    //         },
-    //         component: () =>
-    //             import ( /* webpackChunkName: "views" */ '@/views/trainExam/index')
-    //     }]
-    // },
-    // {
-    //     path: '/applyexam',
-    //     redirect: '/applyexam/index',
-    //     component: Layout,
-    //     children: [{
-    //         path: 'index',
-    //         name: '报名考试',
-    //         meta: {
-    //             i18n: 'index',
-    //         },
-    //         component: () =>
-    //             import( /* webpackChunkName: "views" */ '@/views/applyexam/index')
-    //     }]
-    // },
-    {
-        path: '/applydetailed',
-        redirect: '/applydetailed/index',
-        component: Layout,
-        children: [{
-            path: 'index',
-            name: '报名清册',
-            meta: {
-                i18n: 'index',
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/applydetailed/index')
-        }]
-    },
-    {
-        path: '/trainApply',
-        redirect: '/trainApply/index',
-        component: Layout,
-        children: [{
-            path: 'index',
-            name: '报名清册',
-            meta: {
-                i18n: 'index',
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/trainApply/index')
-        }]
-    },
-    {
-        path: '/startexam',
-        redirect: '/startexam/index',
-        component: Layout,
-        children: [{
-            path: 'index',
-            name: '开始考试',
-            meta: {
-                i18n: 'index',
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/startexam/index')
-        }]
-    },
-    {
-        path: '/titleDetails',
-        component: () =>
-            import ( /* webpackChunkName: "views" */ '@/views/exam/topicDetails')
-    },
-    {
-        path: '',
-        component: Layout,
-        children: [{
-            path: '/exam/subjects/:id',
-            component: () =>
-                import ('@/views/exam/examSubjects'),
-            name: '题目管理',
-            title: '题目管理',
-            noCache: true
-        }]
-    },
-    {
-        path: '',
-        component: Layout,
-        children: [{
-            path: '/startexam/:id',
-            component: () =>
-                import ('@/views/startexam/index'),
-            name: '开始考试',
-            title: '开始考试',
-            noCache: true
-        }]
-    },
-    // {
-    //     path: '/traincompany',
-    //     component: Layout,
-    //     redirect: '/traincompany/index',
-    //     children: [{
-    //         path: 'index',
-    //         name: '培训公司查询',
-    //         meta: {
-    //             i18n: 'dict'
-    //         },
-    //         component: () =>
-    //             import ( /* webpackChunkName: "views" */ '@/views/traincompany/index')
-    //     }]
-    // },
-    {
-        path: '/dispatchChildoperableSee',
-        component: Layout,
-        redirect: '/dispatchChildoperableSee/index',
-        children: [{
-            path: 'index',
-            name: '派遣记录',
-            meta: {
-                i18n: 'index'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/dispatch/dispatchChildoperableSee')
-        }]
-    },
-    {
-        path: '/expression',
-        component: Layout,
-        redirect: '/expression/index',
-        children: [{
-            path: 'index',
-            name: '表现记录',
-            meta: {
-                i18n: 'index'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/people/expression')
-        }]
-    }, {
-        path: '/job',
-        component: Layout,
-        redirect: '/job/index',
-        children: [{
-            path: 'index',
-            name: '从业记录',
-            meta: {
-                i18n: 'index'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/people/job')
-        }]
-    }, {
-        path: '/resource',
-        redirect: '/resource/uploadNotice',
-        component: Layout,
-        children: [{
-            path: 'uploadNotice',
-            name: '通知公告>附件上传',
-            meta: {
-                i18n: 'index',
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/resource/uploadNotice')
-        }]
-    },
-    {
-        path: '/applydetailed',
-        redirect: '/applydetailed/papers',
-        component: Layout,
-        children: [{
-            path: 'papers',
-            name: '报名清册信息',
-            meta: {
-                i18n: 'index',
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/applydetailed/papers')
-        }]
-    },
-    {
-        path: '/exam',
-        redirect: '/exam/papers',
-        component: Layout,
-        children: [{
-            path: 'papers',
-            name: '保安证',
-            meta: {
-                i18n: 'index',
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/exam/papers')
-        }]
-    }
-]
\ No newline at end of file
+      path: 'dispatchChildoperable',
+      name: '派遣记录管理',
+      meta: {
+        i18n: 'dispatch'
+      },
+      component: () =>
+        import ( /* webpackChunkName: "views" */ '@/views/dispatch/dispatchChildoperable')
+    }]
+  }, {
+    path: '/dispatchChild',
+    component: Layout,
+    redirect: '/dispatchChild/index',
+    children: [{
+      path: 'index',
+      name: '派遣服务记录',
+      meta: {
+        i18n: 'dict'
+      },
+      component: () =>
+        import ( /* webpackChunkName: "views" */ '@/views/dispatchChild/index')
+    }]
+  }, {
+    path: '/applyexam',
+    redirect: '/applyexam/papers',
+    component: Layout,
+    children: [{
+      path: 'papers',
+      name: '准考证信息',
+      meta: {
+        i18n: 'index',
+      },
+      component: () =>
+        import ( /* webpackChunkName: "views" */ '@/views/applyexam/papers')
+    }]
+  },
+  // {
+  //     path: '/equipments',
+  //     component: Layout,
+  //     redirect: '/equipments/index',
+  //     children: [{
+  //         path: 'index',
+  //         name: '保安公司装备管理',
+  //         meta: {
+  //             i18n: 'dict'
+  //         },
+  //         component: () =>
+  //             import( /* webpackChunkName: "views" */ '@/views/equipments/index')
+  //     }]
+  // }, {
+  //     path: '/car',
+  //     component: Layout,
+  //     redirect: '/car/index',
+  //     children: [{
+  //         path: 'index',
+  //         name: '保安公司车辆管理',
+  //         meta: {
+  //             i18n: 'dict'
+  //         },
+  //         component: () =>
+  //             import( /* webpackChunkName: "views" */ '@/views/car/index')
+  //     }]
+  // }, {
+  //     path: '/gun',
+  //     component: Layout,
+  //     redirect: '/gun/index',
+  //     children: [{
+  //         path: 'index',
+  //         name: '保安公司枪支管理',
+  //         meta: {
+  //             i18n: 'dict'
+  //         },
+  //         component: () =>
+  //             import( /* webpackChunkName: "views" */ '@/views/gun/index')
+  //     }]
+  // },
+  // {
+  //     path: '/securityEquipment',
+  //     component: Layout,
+  //     redirect: '/securityEquipment',
+  //     children: [{
+  //         path: 'equipments',
+  //         name: '装备管理',
+  //         meta: {
+  //             i18n: 'securityEquipment'
+  //         },
+  //         component: () =>
+  //             import( /* webpackChunkName: "views" */ '@/views/securityEquipment/equipments')
+  //     }, {
+  //         path: 'car',
+  //         name: '车辆管理',
+  //         meta: {
+  //             i18n: 'car'
+  //         },
+  //         component: () =>
+  //             import( /* webpackChunkName: "views" */ '@/views/securityEquipment/car')
+  //     }, {
+  //         path: 'gun',
+  //         name: '车辆管理',
+  //         meta: {
+  //             i18n: 'gun'
+  //         },
+  //         component: () =>
+  //             import( /* webpackChunkName: "views" */ '@/views/securityEquipment/gun')
+  //     }]
+  // },
+  // {
+  //     path: '/trainingRegistration',
+  //     component: Layout,
+  //     redirect: '/trainingRegistration/index',
+  //     children: [{
+  //         path: 'index',
+  //         name: '保安培训报名',
+  //         meta: {
+  //             i18n: 'dict'
+  //         },
+  //         component: () =>
+  //             import ( /* webpackChunkName: "views" */ '@/views/trainingRegistration/index')
+  //     }]
+  // },
+  // {
+  //     path: '/trainExam',
+  //     component: Layout,
+  //     redirect: '/trainExam/index',
+  //     children: [{
+  //         path: 'index',
+  //         name: '考试申请',
+  //         meta: {
+  //             i18n: 'dict'
+  //         },
+  //         component: () =>
+  //             import ( /* webpackChunkName: "views" */ '@/views/trainExam/index')
+  //     }]
+  // },
+  // {
+  //     path: '/applyexam',
+  //     redirect: '/applyexam/index',
+  //     component: Layout,
+  //     children: [{
+  //         path: 'index',
+  //         name: '报名考试',
+  //         meta: {
+  //             i18n: 'index',
+  //         },
+  //         component: () =>
+  //             import( /* webpackChunkName: "views" */ '@/views/applyexam/index')
+  //     }]
+  // },
+  {
+    path: '/applydetailed',
+    redirect: '/applydetailed/index',
+    component: Layout,
+    children: [{
+      path: 'index',
+      name: '报名清册',
+      meta: {
+        i18n: 'index',
+      },
+      component: () =>
+        import ( /* webpackChunkName: "views" */ '@/views/applydetailed/index')
+    }]
+  },
+  {
+    path: '/trainApply',
+    redirect: '/trainApply/index',
+    component: Layout,
+    children: [{
+      path: 'index',
+      name: '报名清册',
+      meta: {
+        i18n: 'index',
+      },
+      component: () =>
+        import ( /* webpackChunkName: "views" */ '@/views/trainApply/index')
+    }]
+  },
+  {
+    path: '/startexam',
+    redirect: '/startexam/index',
+    component: Layout,
+    children: [{
+      path: 'index',
+      name: '开始考试',
+      meta: {
+        i18n: 'index',
+      },
+      component: () =>
+        import ( /* webpackChunkName: "views" */ '@/views/startexam/index')
+    }]
+  },
+  {
+    path: '/titleDetails',
+    component: () =>
+      import ( /* webpackChunkName: "views" */ '@/views/exam/topicDetails')
+  },
+  {
+    path: '',
+    component: Layout,
+    children: [{
+      path: '/exam/subjects/:id',
+      component: () =>
+        import ('@/views/exam/examSubjects'),
+      name: '题目管理',
+      title: '题目管理',
+      noCache: true
+    }]
+  },
+  {
+    path: '',
+    component: Layout,
+    children: [{
+      path: '/startexam/:id',
+      component: () =>
+        import ('@/views/startexam/index'),
+      name: '开始考试',
+      title: '开始考试',
+      noCache: true
+    }]
+  },
+  // {
+  //     path: '/traincompany',
+  //     component: Layout,
+  //     redirect: '/traincompany/index',
+  //     children: [{
+  //         path: 'index',
+  //         name: '培训公司查询',
+  //         meta: {
+  //             i18n: 'dict'
+  //         },
+  //         component: () =>
+  //             import ( /* webpackChunkName: "views" */ '@/views/traincompany/index')
+  //     }]
+  // },
+  {
+    path: '/dispatchChildoperableSee',
+    component: Layout,
+    redirect: '/dispatchChildoperableSee/index',
+    children: [{
+      path: 'index',
+      name: '派遣记录',
+      meta: {
+        i18n: 'index'
+      },
+      component: () =>
+        import ( /* webpackChunkName: "views" */ '@/views/dispatch/dispatchChildoperableSee')
+    }]
+  },
+  {
+    path: '/expression',
+    component: Layout,
+    redirect: '/expression/index',
+    children: [{
+      path: 'index',
+      name: '表现记录',
+      meta: {
+        i18n: 'index'
+      },
+      component: () =>
+        import ( /* webpackChunkName: "views" */ '@/views/people/expression')
+    }]
+  }, {
+    path: '/job',
+    component: Layout,
+    redirect: '/job/index',
+    children: [{
+      path: 'index',
+      name: '从业记录',
+      meta: {
+        i18n: 'index'
+      },
+      component: () =>
+        import ( /* webpackChunkName: "views" */ '@/views/people/job')
+    }]
+  }, {
+    path: '/resource',
+    redirect: '/resource/uploadNotice',
+    component: Layout,
+    children: [{
+      path: 'uploadNotice',
+      name: '通知公告>附件上传',
+      meta: {
+        i18n: 'index',
+      },
+      component: () =>
+        import ( /* webpackChunkName: "views" */ '@/views/resource/uploadNotice')
+    }]
+  },
+  {
+    path: '/applydetailed',
+    redirect: '/applydetailed/papers',
+    component: Layout,
+    children: [{
+      path: 'papers',
+      name: '报名清册信息',
+      meta: {
+        i18n: 'index',
+      },
+      component: () =>
+        import ( /* webpackChunkName: "views" */ '@/views/applydetailed/papers')
+    }]
+  },
+  {
+    path: '/exam',
+    redirect: '/exam/papers',
+    component: Layout,
+    children: [{
+      path: 'papers',
+      name: '保安证',
+      meta: {
+        i18n: 'index',
+      },
+      component: () =>
+        import ( /* webpackChunkName: "views" */ '@/views/exam/papers')
+    }]
+  }
+]
diff --git a/src/styles/common.scss b/src/styles/common.scss
index 4507ae7..f18866b 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -19,12 +19,42 @@
 //通用配置
 @import './normalize.scss';
 
-a{
+a {
   text-decoration: none;
-  color:#333;
+  color: #333;
 }
-*{
+
+* {
   outline: none;
 }
+
 //滚动条样式
-@include scrollBar;
\ No newline at end of file
+@include scrollBar;
+
+
+.see-img-box {
+
+  .el-dialog {
+    width: 840px;
+    height: 540px;
+
+    .el-dialog__body {
+      padding: 4px;
+      position: relative;
+      height: calc(100% - 62px);
+    }
+
+    div.img {
+      position: absolute;
+      top: 0;
+      left: 0;
+      right: 0;
+      bottom: 0;
+      margin: auto;
+      width: calc(100% - 8px);
+      height: calc(100% - 8px);
+      overflow: hidden;
+    }
+  }
+
+}
diff --git a/src/views/applyexam/index.vue b/src/views/applyexam/index.vue
index 0a1789a..b147e65 100644
--- a/src/views/applyexam/index.vue
+++ b/src/views/applyexam/index.vue
@@ -351,7 +351,7 @@
         //tree 默认展开
         defaultExpandAll: true,
         // 操作栏宽度
-        menuWidth: 300,
+        menuWidth: 250,
 
         column: [
           {
@@ -634,61 +634,56 @@
           //   editDetail: false,
           //   width: 150,
           // },
-          // {
-          //   label: "报名状态",
-          //   prop: "applyStatus",
-          //   slot: true,
-          //   searchSpan: 4,
-          //   // 表单新增时是否禁止
-          //   addDisabled: false,
-          //   // 表单新增时是否可见
-          //   addDisplay: false,
-          //   // 表单新增时是否为查看模式
-          //   addDetail: false,
-          //   // 表单编辑时是否禁止
-          //   editDisabled: false,
-          //   // 表单编辑时是否可见
-          //   editDisplay: true,
-          //   // 表单编辑时是否为查看模式
-          //   editDetail: false,
-          //   dicData: DIC.applyStatus,
-          //   search: true,
-          //   type: "select",
-          // },
-          // {
-          //     label: "审核状态",
-          //     prop: "examinationType",
-          //     slot: true,
-          //     searchSpan:5,
-          //     // 表单新增时是否禁止
-          //     addDisabled: false,
-          //     // 表单新增时是否可见
-          //     addDisplay: false,
-          //     // 表单新增时是否为查看模式
-          //     addDetail: false,
-          //     // 表单编辑时是否禁止
-          //     editDisabled: false,
-          //     // 表单编辑时是否可见
-          //     editDisplay: true,
-          //     // 表单编辑时是否为查看模式
-          //     editDetail: false,
-          //     dicData:[
-          //         {
-          //             label: '待审核',
-          //             value: "1"
-          //         },
-          //         {
-          //             label: '审核通过',
-          //             value: "2"
-          //         },
-          //         {
-          //             label: '审核不通过',
-          //             value: "3"
-          //         }
-          //         ],
-          //     search:true,
-          //     type:"select"
-          // },
+          
+          {
+              label: "审查状态",
+              prop: "examinationType",
+              slot: true,
+              searchSpan:5,
+              // 表单新增时是否禁止
+              addDisabled: false,
+              // 表单新增时是否可见
+              addDisplay: false,
+              // 表单新增时是否为查看模式
+              addDetail: false,
+              // 表单编辑时是否禁止
+              editDisabled: false,
+              // 表单编辑时是否可见
+              editDisplay: true,
+              // 表单编辑时是否为查看模式
+              editDetail: false,
+              dicData:[
+                  {
+                      label: '正常',
+                      value: "1"
+                  },
+                  {
+                      label: '异常',
+                      value: "2"
+                  }
+                  ],
+              search:true,
+              type:"select"
+          },
+          {
+            label: "审查明细",
+            prop: "examinationMx",
+            slot: true,
+            // 表单新增时是否禁止
+            addDisabled: false,
+            // 表单新增时是否可见
+            addDisplay: false,
+            // 表单新增时是否为查看模式
+            addDetail: false,
+            // 表单编辑时是否禁止
+            editDisabled: false,
+            // 表单编辑时是否可见
+            editDisplay: true,
+            // 表单编辑时是否为查看模式
+            editDetail: false,
+            overHidden:true,
+            width:150,
+          },
         ],
       },
       questionBankSearch: {},
diff --git a/src/views/companyApply/index.vue b/src/views/companyApply/index.vue
index 01b9afb..bf11c8e 100644
--- a/src/views/companyApply/index.vue
+++ b/src/views/companyApply/index.vue
@@ -560,40 +560,108 @@
 
     //批量报名
     handleBatchApply() {
-      this.dialogBatchFormVisible = true;
+      // this.dialogBatchFormVisible = true;
+      if (this.questionBankSelectionList.length === 0) {
+          this.$confirm("确定全部人员报名?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          }).then(() => {
+            var userIds = "";
+            addBatchApply(userIds,this.userInfo.dept_id).then(
+              (res) => {
+                this.questionBankOnLoad(this.questionBankPage);
+                if (res.data.data == 201) {
+                  this.$message({
+                    type: "warning",
+                    message: "已报名,不能重复报名",
+                  });
+                } else if (res.data.data == 201) {
+                  this.$message({
+                    type: "warning",
+                    message: "报名失败",
+                  });
+                } else {
+                  this.$message({
+                    type: "success",
+                    message: "报名成功",
+                  });
+                  this.$refs.formBatchApply.resetFields();
+                  this.dialogBatchFormVisible = false;
+                }
+              },
+              (error) => {
+                window.console.log(error);
+              }
+            );
+        })
+      }else{
+        this.$confirm("确定选择人员报名?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          }).then(() => {
+            addBatchApply(this.ids,this.userInfo.dept_id).then(
+              (res) => {
+                this.questionBankOnLoad(this.questionBankPage);
+                if (res.data.data == 201) {
+                  this.$message({
+                    type: "warning", 
+                    message: "已报名,不能重复报名",
+                  });
+                } else if (res.data.data == 201) {
+                  this.$message({
+                    type: "warning",
+                    message: "报名失败",
+                  });
+                } else {
+                  this.$message({
+                    type: "success",
+                    message: "报名成功",
+                  });
+                  this.$refs.formBatchApply.resetFields();
+                  this.dialogBatchFormVisible = false;
+                }
+              },
+              (error) => {
+                window.console.log(error);
+              }
+            );
+        })
+      }
     },
 
     //批量报名提交
-    submitBatchApply(){
-        addBatchApply({
-          userIds: this.BatchApply.userId.join(","),
-        }).then(
-          (res) => {
-            this.questionBankOnLoad(this.questionBankPage);
-            if (res.data.data == 201) {
-              this.$message({
-                type: "warning",
-                message: "已报名,不能重复报名",
-              });
-            } else if (res.data.data == 201) {
-              this.$message({
-                type: "warning",
-                message: "报名失败",
-              });
-            } else {
-              this.$message({
-                type: "success",
-                message: "报名成功",
-              });
-              this.$refs.formBatchApply.resetFields();
-              this.dialogBatchFormVisible = false;
-            }
-          },
-          (error) => {
-            window.console.log(error);
-          }
-        );
-    },
+    // submitBatchApply(){
+    //     addBatchApply({
+    //       userIds: this.BatchApply.userId.join(","),
+    //     }).then(
+    //       (res) => {
+    //         this.questionBankOnLoad(this.questionBankPage);
+    //         if (res.data.data == 201) {
+    //           this.$message({
+    //             type: "warning",
+    //             message: "已报名,不能重复报名",
+    //           });
+    //         } else if (res.data.data == 201) {
+    //           this.$message({
+    //             type: "warning",
+    //             message: "报名失败",
+    //           });
+    //         } else {
+    //           this.$message({
+    //             type: "success",
+    //             message: "报名成功",
+    //           });
+    //           this.$refs.formBatchApply.resetFields();
+    //           this.dialogBatchFormVisible = false;
+    //         }
+    //       },
+    //       (error) => {
+    //         window.console.log(error);
+    //       }
+    //     );
+    // },
 
     //关闭窗口清除数据
     closeDialog(){
diff --git a/src/views/exam/performance.vue b/src/views/exam/performance.vue
index 603838e..1c9f5d8 100644
--- a/src/views/exam/performance.vue
+++ b/src/views/exam/performance.vue
@@ -158,6 +158,7 @@
                 trigger: "blur",
               },
             ],
+            overHidden:true,
           },
           {
             label: "保安姓名",
@@ -279,7 +280,7 @@
               label: "总成绩",
               prop: "allGrade",
               slot: true,
-              hide:true,
+              // hide:true,
               // 表单新增时是否禁止
               addDisabled: false,
               viewDisplay:false,
@@ -411,6 +412,7 @@
   methods: {
     questionBankOnLoad(page, params = {}) {
       this.questionBankLoading = false;
+      params["examType"] = 1;
       getList(
         page.currentPage,
         page.pageSize,
diff --git a/src/views/exam/singleperformance.vue b/src/views/exam/singleperformance.vue
index 805626d..f96cb01 100644
--- a/src/views/exam/singleperformance.vue
+++ b/src/views/exam/singleperformance.vue
@@ -149,6 +149,7 @@
                 trigger: "blur",
               },
             ],
+            overHidden:true,
           },
           {
             label: "保安姓名",
@@ -357,6 +358,7 @@
     },
     questionBankOnLoad(page, params = {}) {
       this.questionBankLoading = false;
+      params["examType"] = 1;
       getList(
         page.currentPage,
         page.pageSize,
diff --git a/src/views/ownerFeedback/owner.vue b/src/views/ownerFeedback/owner.vue
new file mode 100644
index 0000000..bec813e
--- /dev/null
+++ b/src/views/ownerFeedback/owner.vue
@@ -0,0 +1,287 @@
+<template>
+  <basic-container>
+    <avue-crud :option="option"
+               :table-loading="loading"
+               :data="data"
+               :page.sync="page"
+               ref="crud"
+               @row-del="rowDel"
+               v-model="form"
+               :permission="permissionList"
+               @row-update="rowUpdate"
+               @row-save="rowSave"
+               :before-open="beforeOpen"
+               @search-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @on-load="onLoad">
+      <template slot="menuLeft">
+        <el-button type="danger"
+                   size="small"
+                   icon="el-icon-delete"
+                   plain
+                   v-if="permission.owner_delete"
+                   @click="handleDelete">删 除
+        </el-button>
+      </template>
+      <template slot-scope="{row}"
+                slot="category">
+        <el-tag>{{row.categoryName}}</el-tag>
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+  import {getList, remove, update, add, getNotice} from "@/api/owner/owner";
+  import {mapGetters} from "vuex";
+
+  export default {
+    data() {
+      return {
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        option: {
+          height: 'auto',
+          calcHeight: 54,
+          dialogWidth: 950,
+          tip: false,
+          searchShow: true,
+          labelWidth: 120,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          excelBtn: true,
+          dialogClickModal: false,
+          column: [
+            {
+              label: "服务单位",
+              prop: "company",
+              search: true,
+              rules: [{
+                required: true,
+                message: "请输入服务单位",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "联系方式",
+              prop: "companyContact",
+            },
+            {
+              label: "反馈时间",
+              prop: "releaseTimeRange",
+              type: "datetime",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd",
+              searchRange: true,
+              hide: true,
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              search: true,
+              rules: [
+                {
+                  required: true,
+                  message: "请输入通知时间",
+                  trigger: "blur",
+                },
+              ],
+            },
+            {
+              label: "反馈时间",
+              prop: "feedbackTime",
+              type: "date",
+              format: "yyyy-MM-dd hh:mm:ss",
+              valueFormat: "yyyy-MM-dd hh:mm:ss",
+              rules: [{
+                required: true,
+                message: "请输入反馈时间",
+                trigger: "click"
+              }]
+            }, {
+              label: "反馈意见",
+              prop: "opinion",
+            }, {
+              label: "业主",
+              prop: "owner",
+              search: true,
+              rules: [{
+                required: true,
+                message: "请输入反馈时间",
+                trigger: "click"
+              }]
+            }, {
+              label: "业主联系方式",
+              prop: "ownerContact",
+            }, {
+              label: "备注",
+              prop: "remarks",
+            }, {
+              label: "处置结果",
+              prop: "result",
+            }
+          ]
+        },
+        data: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.owner_add, false),
+          viewBtn: this.vaildData(this.permission.owner_view, false),
+          delBtn: this.vaildData(this.permission.owner_delete, false),
+          editBtn: this.vaildData(this.permission.owner_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+      rowSave(row, done, loading) {
+        add(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          window.console.log(error);
+          loading();
+        });
+      },
+      rowUpdate(row, index, done, loading) {
+        update(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          window.console.log(error);
+          loading();
+        });
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(row.id);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      searchReset() {
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      selectionClear() {
+        this.selectionList = [];
+        this.$refs.crud.toggleSelection();
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getNotice(this.form.id).then(res => {
+            this.form = res.data.data;
+          });
+        }
+        done();
+      },
+      currentChange(currentPage) {
+        this.page.currentPage = currentPage;
+      },
+      sizeChange(pageSize) {
+        this.page.pageSize = pageSize;
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query);
+      },
+      onLoad(page, params = {}) {
+        const {releaseTimeRange} = this.query;
+        let values = {
+          ...params,
+        };
+        if (releaseTimeRange) {
+          values = {
+            ...params,
+            startTime: releaseTimeRange[0],
+            endTime: releaseTimeRange[1],
+            ...this.query
+          };
+          values.releaseTimeRange = null;
+        }
+        this.loading = true;
+        getList(page.currentPage, page.pageSize, values).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
+    }
+  };
+</script>
+
+<style>
+</style>
diff --git a/src/views/resource/attach.vue b/src/views/resource/attach.vue
index 763c1ba..73d687f 100644
--- a/src/views/resource/attach.vue
+++ b/src/views/resource/attach.vue
@@ -1,72 +1,81 @@
 <template>
-  <basic-container class="hasButTwo">
-    <avue-crud
-      :option="option"
-      :table-loading="loading"
-      :data="data"
-      :page.sync="page"
-      :permission="permissionList"
-      :before-open="beforeOpen"
-      v-model="form"
-      ref="crud"
-      @row-del="rowDel"
-      @search-change="searchChange"
-      @search-reset="searchReset"
-      @selection-change="selectionChange"
-      @current-change="currentChange"
-      @size-change="sizeChange"
-      @refresh-change="refreshChange"
-      @on-load="onLoad"
-    >
-      <template slot="menuLeft">
-        <el-button
-          type="primary"
-          size="small"
-          plain
-          v-if="permission.attach_upload"
-          icon="el-icon-upload2"
-          @click="handleUpload"
-          >上 传
-        </el-button>
-        <el-button
-          type="danger"
-          size="small"
-          icon="el-icon-delete"
-          plain
-          v-if="permission.attach_delete"
-          @click="handleDelete"
-          >删 除
-        </el-button>
-      </template>
-      <template slot-scope="scope" slot="menu">
-        <el-button
-          type="text"
-          icon="el-icon-download"
-          size="small"
-          v-if="permission.attach_download"
-          @click="handleDownload(scope.row)"
-          >下载
-        </el-button>
-      </template>
-      <template slot-scope="{ row }" slot="attachSize">
-        <el-tag>{{ `${row.attachSize} KB` }}</el-tag>
-      </template>
-    </avue-crud>
-    <el-dialog
-      title="附件管理"
-      append-to-body
-      :visible.sync="attachBox"
-      width="555px"
-    >
-      <avue-form
-        ref="form"
-        :option="attachOption"
-        v-model="attachForm"
-        :upload-after="uploadAfter"
-      >
-      </avue-form>
-    </el-dialog>
-  </basic-container>
+    <basic-container class="hasButTwo">
+        <avue-crud :option="option"
+                   :table-loading="loading"
+                   :data="data"
+                   :page.sync="page"
+                   :permission="permissionList"
+                   :before-open="beforeOpen"
+                   v-model="form"
+                   ref="crud"
+                   @row-del="rowDel"
+                   @search-change="searchChange"
+                   @search-reset="searchReset"
+                   @selection-change="selectionChange"
+                   @current-change="currentChange"
+                   @size-change="sizeChange"
+                   @refresh-change="refreshChange"
+                   @on-load="onLoad">
+            <template slot="menuLeft">
+                <el-button type="primary"
+                           size="small"
+                           plain
+                           v-if="permission.attach_upload"
+                           icon="el-icon-upload2"
+                           @click="handleUpload">上 传
+                </el-button>
+                <el-button type="danger"
+                           size="small"
+                           icon="el-icon-delete"
+                           plain
+                           v-if="permission.attach_delete"
+                           @click="handleDelete">删 除
+                </el-button>
+            </template>
+            <template slot-scope="scope"
+                      slot="menu">
+                <el-button type="text"
+                           icon="el-icon-download"
+                           size="small"
+                           v-if="permission.attach_download"
+                           @click="handleDownload(scope.row)">下载222
+                </el-button>
+                <el-button type="text"
+                           icon="el-icon-picture-outline-round"
+                           size="small"
+                           v-show="!fileFormat(scope.row)"
+                           @click="seeImages(scope.row)">预览
+                </el-button>
+            </template>
+            <template slot-scope="{ row }"
+                      slot="attachSize">
+                <el-tag>{{ `${row.attachSize} KB` }}</el-tag>
+            </template>
+        </avue-crud>
+        <el-dialog title="附件管理"
+                   append-to-body
+                   :visible.sync="attachBox"
+                   width="555px">
+            <avue-form ref="form"
+                       :option="attachOption"
+                       v-model="attachForm"
+                       :upload-after="uploadAfter">
+            </avue-form>
+        </el-dialog>
+
+        <el-dialog title="预览"
+                   append-to-body
+                   :visible.sync="imgSee"
+                   class="see-img-box">
+
+            <div class="img"
+                 :style="{background: imgUrl}">
+
+            </div>
+
+        </el-dialog>
+
+    </basic-container>
 </template>
 
 <script>
@@ -74,270 +83,288 @@
 import { mapGetters } from "vuex";
 
 export default {
-  data() {
-    var type = 4;
-    var deptid = this.$route.query.deptId;
-    return {
-      form: {},
-      query: {},
-      putParam: "",
-      loading: true,
-      page: {
-        pageSize: 10,
-        currentPage: 1,
-        total: 0,
-      },
-      attachBox: false,
-      selectionList: [],
-      option: {
-        height: "auto",
-        calcHeight: 30,
-        tip: false,
-        searchShow: true,
-        searchMenuSpan: 6,
-        border: false,
-        index: true,
-        stripe: true,
-        viewBtn: true,
-        selection: true,
-        dialogClickModal: false,
-        column: [
-          {
-            label: "附件地址",
-            prop: "link",
-            rules: [
-              {
-                required: true,
-                message: "请输入附件地址",
-                trigger: "blur",
-              },
-            ],
-          },
-          {
-            label: "附件域名",
-            prop: "domain",
-            search: true,
-            rules: [
-              {
-                required: true,
-                message: "请输入附件域名",
-                trigger: "blur",
-              },
-            ],
-          },
-          {
-            label: "附件名称",
-            prop: "name",
-            search: true,
-            rules: [
-              {
-                required: true,
-                message: "请输入附件名称",
-                trigger: "blur",
-              },
-            ],
-          },
-          {
-            label: "附件原名",
-            prop: "originalName",
-            search: true,
-            rules: [
-              {
-                required: true,
-                message: "请输入附件原名",
-                trigger: "blur",
-              },
-            ],
-          },
-          {
-            label: "附件拓展名",
-            prop: "extension",
-            rules: [
-              {
-                required: true,
-                message: "请输入附件拓展名",
-                trigger: "blur",
-              },
-            ],
-          },
-          {
-            label: "附件大小",
-            prop: "attachSize",
-            slot: true,
-            rules: [
-              {
-                required: true,
-                message: "请输入附件大小",
-                trigger: "blur",
-              },
-            ],
-          },
-        ],
-      },
-      data: [],
-      attachForm: {},
-      attachOption: {
-        submitBtn: false,
-        emptyBtn: false,
-        column: [
-          {
-            label: "附件上传",
-            prop: "attachFile",
-            type: "upload",
-            drag: true,
-            loadText: "模板上传中,请稍等",
-            span: 24,
-            propsHttp: {
-              res: "data",
+    data () {
+        var type = 4;
+        var deptid = this.$route.query.deptId;
+        return {
+            form: {},
+            query: {},
+            putParam: "",
+            loading: true,
+            page: {
+                pageSize: 10,
+                currentPage: 1,
+                total: 0,
             },
-            action:
-              "/api/blade-resource/oss/endpoint/put-file-attach?type=" +
-              type +
-              "&deptid=" +
-              deptid,
-          },
-        ],
-      },
-    };
-  },
-  computed: {
-    ...mapGetters(["permission"]),
-    permissionList() {
-      return {
-        addBtn: false,
-        editBtn: false,
-        viewBtn: false,
-        delBtn: this.vaildData(this.permission.attach_delete, false),
-      };
+            attachBox: false,
+            selectionList: [],
+            option: {
+                height: "auto",
+                calcHeight: 30,
+                tip: false,
+                searchShow: true,
+                searchMenuSpan: 6,
+                border: false,
+                index: true,
+                stripe: true,
+                viewBtn: true,
+                selection: true,
+                dialogClickModal: false,
+                column: [
+                    {
+                        label: "附件地址",
+                        prop: "link",
+                        rules: [
+                            {
+                                required: true,
+                                message: "请输入附件地址",
+                                trigger: "blur",
+                            },
+                        ],
+                    },
+                    {
+                        label: "附件域名",
+                        prop: "domain",
+                        search: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: "请输入附件域名",
+                                trigger: "blur",
+                            },
+                        ],
+                    },
+                    {
+                        label: "附件名称",
+                        prop: "name",
+                        search: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: "请输入附件名称",
+                                trigger: "blur",
+                            },
+                        ],
+                    },
+                    {
+                        label: "附件原名",
+                        prop: "originalName",
+                        search: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: "请输入附件原名",
+                                trigger: "blur",
+                            },
+                        ],
+                    },
+                    {
+                        label: "附件拓展名",
+                        prop: "extension",
+                        rules: [
+                            {
+                                required: true,
+                                message: "请输入附件拓展名",
+                                trigger: "blur",
+                            },
+                        ],
+                    },
+                    {
+                        label: "附件大小",
+                        prop: "attachSize",
+                        slot: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: "请输入附件大小",
+                                trigger: "blur",
+                            },
+                        ],
+                    },
+                ],
+            },
+            data: [],
+            attachForm: {},
+            attachOption: {
+                submitBtn: false,
+                emptyBtn: false,
+                column: [
+                    {
+                        label: "附件上传",
+                        prop: "attachFile",
+                        type: "upload",
+                        drag: true,
+                        loadText: "模板上传中,请稍等",
+                        span: 24,
+                        propsHttp: {
+                            res: "data",
+                        },
+                        action:
+                            "/api/blade-resource/oss/endpoint/put-file-attach?type=" +
+                            type +
+                            "&deptid=" +
+                            deptid,
+                    },
+                ],
+            },
+            imgSee: false,
+            imgUrl: ""
+        };
     },
-    ids() {
-      let ids = [];
-      this.selectionList.forEach((ele) => {
-        ids.push(ele.id);
-      });
-      return ids.join(",");
+    computed: {
+        ...mapGetters(["permission"]),
+        permissionList () {
+            return {
+                addBtn: false,
+                editBtn: false,
+                viewBtn: false,
+                delBtn: this.vaildData(this.permission.attach_delete, false),
+            };
+        },
+        ids () {
+            let ids = [];
+            this.selectionList.forEach((ele) => {
+                ids.push(ele.id);
+            });
+            return ids.join(",");
+        },
     },
-  },
-  mounted() {
-    var flag = false,
-      i = 0,
-      ind = null;
-    this.$store.state.tags.tagList.forEach((item, index) => {
-      if (item.label == "附件上传") {
-        if (flag == false) {
-          ind = index;
-          flag = true;
+    mounted () {
+        var flag = false,
+            i = 0,
+            ind = null;
+        this.$store.state.tags.tagList.forEach((item, index) => {
+            if (item.label == "附件上传") {
+                if (flag == false) {
+                    ind = index;
+                    flag = true;
+                }
+                i++;
+            }
+        });
+        if (i > 1) {
+            this.$store.state.tags.tagList.splice(ind, 1);
         }
-        i++;
-      }
-    });
-    if (i > 1) {
-      this.$store.state.tags.tagList.splice(ind, 1);
-    }
-  },
-  methods: {
-    handleUpload() {
-      this.attachBox = true;
     },
-    uploadAfter(res, done, loading, column) {
-      window.console.log(column);
-      this.attachBox = false;
-      this.refreshChange();
-      done();
+    methods: {
+        handleUpload () {
+            this.attachBox = true;
+        },
+        uploadAfter (res, done, loading, column) {
+            window.console.log(column);
+            this.attachBox = false;
+            this.refreshChange();
+            done();
+        },
+        handleDownload (row) {
+            window.open(`${row.link}`);
+        },
+        rowDel (row) {
+            this.$confirm("确定将选择数据删除?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    return remove(row.id);
+                })
+                .then(() => {
+                    this.onLoad(this.page);
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!",
+                    });
+                });
+        },
+        handleDelete () {
+            if (this.selectionList.length === 0) {
+                this.$message.warning("请选择至少一条数据");
+                return;
+            }
+            this.$confirm("确定将选择数据删除?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    return remove(this.ids);
+                })
+                .then(() => {
+                    this.onLoad(this.page);
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!",
+                    });
+                    this.$refs.crud.toggleSelection();
+                });
+        },
+        beforeOpen (done, type) {
+            if (["edit", "view"].includes(type)) {
+                getDetail(this.form.id).then((res) => {
+                    this.form = res.data.data;
+                });
+            }
+            done();
+        },
+        searchReset () {
+            this.query = {};
+            this.onLoad(this.page);
+        },
+        searchChange (params, done) {
+            this.query = params;
+            this.page.currentPage = 1;
+            this.onLoad(this.page, params);
+            done();
+        },
+        selectionChange (list) {
+            this.selectionList = list;
+        },
+        selectionClear () {
+            this.selectionList = [];
+            this.$refs.crud.toggleSelection();
+        },
+        currentChange (currentPage) {
+            this.page.currentPage = currentPage;
+        },
+        sizeChange (pageSize) {
+            this.page.pageSize = pageSize;
+        },
+        refreshChange () {
+            this.onLoad(this.page, this.query);
+        },
+        onLoad (page, params = {}) {
+            params.type = 4;
+            params.deptid = this.$route.query.deptId;
+            this.loading = true;
+            getList(
+                page.currentPage,
+                page.pageSize,
+                Object.assign(params, this.query)
+            ).then((res) => {
+                const data = res.data.data;
+                this.page.total = data.total;
+                this.data = data.records;
+                this.loading = false;
+                this.selectionClear();
+            });
+        },
+
+        seeImages (row) {
+            this.imgUrl = "";
+            this.imgUrl = "url(" + row.link + ") center center / contain no-repeat";
+
+            this.imgSee = true;
+        },
+
+        fileFormat (row) {
+            var index = row.link.lastIndexOf(".");
+            var ext = row.link.substr(index + 1);
+
+            return [
+                'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].
+                indexOf(ext.toLowerCase()) == -1;
+        }
     },
-    handleDownload(row) {
-      window.open(`${row.link}`);
-    },
-    rowDel(row) {
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          return remove(row.id);
-        })
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!",
-          });
-        });
-    },
-    handleDelete() {
-      if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
-        return;
-      }
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          return remove(this.ids);
-        })
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!",
-          });
-          this.$refs.crud.toggleSelection();
-        });
-    },
-    beforeOpen(done, type) {
-      if (["edit", "view"].includes(type)) {
-        getDetail(this.form.id).then((res) => {
-          this.form = res.data.data;
-        });
-      }
-      done();
-    },
-    searchReset() {
-      this.query = {};
-      this.onLoad(this.page);
-    },
-    searchChange(params, done) {
-      this.query = params;
-      this.page.currentPage = 1;
-      this.onLoad(this.page, params);
-      done();
-    },
-    selectionChange(list) {
-      this.selectionList = list;
-    },
-    selectionClear() {
-      this.selectionList = [];
-      this.$refs.crud.toggleSelection();
-    },
-    currentChange(currentPage) {
-      this.page.currentPage = currentPage;
-    },
-    sizeChange(pageSize) {
-      this.page.pageSize = pageSize;
-    },
-    refreshChange() {
-      this.onLoad(this.page, this.query);
-    },
-    onLoad(page, params = {}) {
-      params.type = 4;
-      params.deptid = this.$route.query.deptId;
-      this.loading = true;
-      getList(
-        page.currentPage,
-        page.pageSize,
-        Object.assign(params, this.query)
-      ).then((res) => {
-        const data = res.data.data;
-        this.page.total = data.total;
-        this.data = data.records;
-        this.loading = false;
-        this.selectionClear();
-      });
-    },
-  },
 };
 </script>
 
diff --git a/src/views/resource/attachCopy.vue b/src/views/resource/attachCopy.vue
index 1f9aac7..05b9808 100644
--- a/src/views/resource/attachCopy.vue
+++ b/src/views/resource/attachCopy.vue
@@ -47,6 +47,14 @@
           @click="handleDownload(scope.row)"
           >下载
         </el-button>
+        <el-button
+          type="text"
+          icon="el-icon-picture-outline-round"
+          size="small"
+          v-show="!fileFormat(scope.row)"
+          @click="seeImages(scope.row)"
+          >预览
+        </el-button>
       </template>
       <template slot-scope="{ row }" slot="attachSize">
         <el-tag>{{ `${row.attachSize} KB` }}</el-tag>
@@ -65,6 +73,15 @@
         :upload-after="uploadAfter"
       >
       </avue-form>
+    </el-dialog>
+
+    <el-dialog
+      title="预览"
+      append-to-body
+      :visible.sync="imgSee"
+      class="see-img-box"
+    >
+      <div class="img" :style="{ background: imgUrl }"></div>
     </el-dialog>
   </basic-container>
 </template>
@@ -161,6 +178,17 @@
             ],
           },
           {
+            label: "所属公司",
+            prop: "enterprisename",
+            rules: [
+              {
+                required: true,
+                message: "请输入所属公司",
+                trigger: "blur",
+              },
+            ],
+          },
+          {
             label: "附件预览",
             prop: "link",
             type: "img",
@@ -171,17 +199,6 @@
             //     trigger: "blur",
             //   },
             // ],
-          },
-          {
-            label: "所属公司",
-            prop: "enterprisename",
-            rules: [
-              {
-                required: true,
-                message: "请输入所属公司",
-                trigger: "blur",
-              },
-            ],
           },
           {
             label: "附件大小",
@@ -221,6 +238,8 @@
           },
         ],
       },
+      imgSee: false,
+      imgUrl: "",
     };
   },
   computed: {
@@ -365,6 +384,32 @@
         this.selectionClear();
       });
     },
+
+    seeImages(row) {
+      this.imgUrl = "";
+      this.imgUrl = "url(" + row.link + ") center center / contain no-repeat";
+
+      this.imgSee = true;
+    },
+
+    fileFormat(row) {
+      var index = row.link.lastIndexOf(".");
+      var ext = row.link.substr(index + 1);
+
+      return (
+        [
+          "png",
+          "jpg",
+          "jpeg",
+          "bmp",
+          "gif",
+          "webp",
+          "psd",
+          "svg",
+          "tiff",
+        ].indexOf(ext.toLowerCase()) == -1
+      );
+    },
   },
 };
 </script>
diff --git a/src/views/resource/uploadNotice.vue b/src/views/resource/uploadNotice.vue
index 8cbbfa2..18d507b 100644
--- a/src/views/resource/uploadNotice.vue
+++ b/src/views/resource/uploadNotice.vue
@@ -1,72 +1,80 @@
 <template>
-  <basic-container class="hasButTwo">
-    <avue-crud
-      :option="option"
-      :table-loading="loading"
-      :data="data"
-      :page.sync="page"
-      :permission="permissionList"
-      :before-open="beforeOpen"
-      v-model="form"
-      ref="crud"
-      @row-del="rowDel"
-      @search-change="searchChange"
-      @search-reset="searchReset"
-      @selection-change="selectionChange"
-      @current-change="currentChange"
-      @size-change="sizeChange"
-      @refresh-change="refreshChange"
-      @on-load="onLoad"
-    >
-      <template slot="menuLeft">
-        <el-button
-          type="primary"
-          size="small"
-          plain
-          v-if="permission.attach_upload"
-          icon="el-icon-upload2"
-          @click="handleUpload"
-          >上 传
-        </el-button>
-        <el-button
-          type="danger"
-          size="small"
-          icon="el-icon-delete"
-          plain
-          v-if="permission.attach_delete"
-          @click="handleDelete"
-          >删 除
-        </el-button>
-      </template>
-      <template slot-scope="scope" slot="menu">
-        <el-button
-          type="text"
-          icon="el-icon-download"
-          size="small"
-          v-if="permission.attach_download"
-          @click="handleDownload(scope.row)"
-          >下载
-        </el-button>
-      </template>
-      <template slot-scope="{ row }" slot="attachSize">
-        <el-tag>{{ `${row.attachSize} KB` }}</el-tag>
-      </template>
-    </avue-crud>
-    <el-dialog
-      title="附件管理"
-      append-to-body
-      :visible.sync="attachBox"
-      width="555px"
-    >
-      <avue-form
-        ref="form"
-        :option="attachOption"
-        v-model="attachForm"
-        :upload-after="uploadAfter"
-      >
-      </avue-form>
-    </el-dialog>
-  </basic-container>
+    <basic-container class="hasButTwo">
+        <avue-crud :option="option"
+                   :table-loading="loading"
+                   :data="data"
+                   :page.sync="page"
+                   :permission="permissionList"
+                   :before-open="beforeOpen"
+                   v-model="form"
+                   ref="crud"
+                   @row-del="rowDel"
+                   @search-change="searchChange"
+                   @search-reset="searchReset"
+                   @selection-change="selectionChange"
+                   @current-change="currentChange"
+                   @size-change="sizeChange"
+                   @refresh-change="refreshChange"
+                   @on-load="onLoad">
+            <template slot="menuLeft">
+                <el-button type="primary"
+                           size="small"
+                           plain
+                           v-if="permission.attach_upload"
+                           icon="el-icon-upload2"
+                           @click="handleUpload">上 传
+                </el-button>
+                <el-button type="danger"
+                           size="small"
+                           icon="el-icon-delete"
+                           plain
+                           v-if="permission.attach_delete"
+                           @click="handleDelete">删 除
+                </el-button>
+            </template>
+            <template slot-scope="scope"
+                      slot="menu">
+                <el-button type="text"
+                           icon="el-icon-download"
+                           size="small"
+                           v-if="permission.attach_download"
+                           @click="handleDownload(scope.row)">下载
+                </el-button>
+                <el-button type="text"
+                           icon="el-icon-picture-outline-round"
+                           size="small"
+                           v-show="!fileFormat(scope.row)"
+                           @click="seeImages(scope.row)">预览
+                </el-button>
+            </template>
+            <template slot-scope="{ row }"
+                      slot="attachSize">
+                <el-tag>{{ `${row.attachSize} KB` }}</el-tag>
+            </template>
+        </avue-crud>
+        <el-dialog title="附件管理"
+                   append-to-body
+                   :visible.sync="attachBox"
+                   width="555px">
+            <avue-form ref="form"
+                       :option="attachOption"
+                       v-model="attachForm"
+                       :upload-after="uploadAfter">
+            </avue-form>
+        </el-dialog>
+
+        <el-dialog title="预览"
+                   append-to-body
+                   :visible.sync="imgSee"
+                   class="see-img-box">
+
+            <div class="img"
+                 :style="{background: imgUrl}">
+
+            </div>
+
+        </el-dialog>
+    </basic-container>
 </template>
 
 <script>
@@ -74,283 +82,296 @@
 import { mapGetters } from "vuex";
 
 export default {
-  data() {
-    var type = 4;
-    var deptid = this.$route.query.deptId;
-    var noticeId = this.$route.query.noticeId;
-    return {
-      form: {},
-      query: {},
-      putParam: "",
-      loading: true,
-      page: {
-        pageSize: 10,
-        currentPage: 1,
-        total: 0,
-      },
-      attachBox: false,
-      selectionList: [],
-      option: {
-        height: "auto",
-        calcHeight: 30,
-        tip: false,
-        searchShow: true,
-        searchMenuSpan: 6,
-        border: false,
-        index: true,
-        // align: center,
-        stripe: true,
-        viewBtn: true,
-        selection: true,
-        dialogClickModal: false,
-        column: [
-          {
-            label: "附件地址",
-            prop: "link",
-            rules: [
-              {
-                required: true,
-                message: "请输入附件地址",
-                trigger: "blur",
-              },
-            ],
-          },
-          {
-            label: "附件域名",
-            prop: "domain",
-            search: true,
-            rules: [
-              {
-                required: true,
-                message: "请输入附件域名",
-                trigger: "blur",
-              },
-            ],
-          },
-          {
-            label: "附件名称",
-            prop: "name",
-            search: true,
-            rules: [
-              {
-                required: true,
-                message: "请输入附件名称",
-                trigger: "blur",
-              },
-            ],
-          },
-          {
-            label: "附件原名",
-            prop: "originalName",
-            search: true,
-            rules: [
-              {
-                required: true,
-                message: "请输入附件原名",
-                trigger: "blur",
-              },
-            ],
-          },
-          {
-            label: "预览图",
-            prop: "link",
-            dataType: "string",
-            type: "img",
-          },
-          {
-            label: "附件拓展名",
-            prop: "extension",
-            rules: [
-              {
-                required: true,
-                message: "请输入附件拓展名",
-                trigger: "blur",
-              },
-            ],
-          },
-          {
-            label: "附件大小",
-            prop: "attachSize",
-            slot: true,
-            rules: [
-              {
-                required: true,
-                message: "请输入附件大小",
-                trigger: "blur",
-              },
-            ],
-          },
-        ],
-      },
-      data: [],
-      attachForm: {},
-      attachOption: {
-        submitBtn: false,
-        emptyBtn: false,
-        column: [
-          {
-            label: "附件上传",
-            prop: "attachFile",
-            type: "upload",
-            drag: true,
-            loadText: "模板上传中,请稍等",
-            span: 24,
-            propsHttp: {
-              res: "data",
+    data () {
+        var type = 4;
+        var deptid = this.$route.query.deptId;
+        var noticeId = this.$route.query.noticeId;
+        return {
+            form: {},
+            query: {},
+            putParam: "",
+            loading: true,
+            page: {
+                pageSize: 10,
+                currentPage: 1,
+                total: 0,
             },
-            action:
-              "/api/blade-resource/oss/endpoint/put-file-attach?type=" +
-              type +
-              "&deptid=" +
-              deptid +
-              "&noticeId=" +
-              noticeId
+            attachBox: false,
+            selectionList: [],
+            option: {
+                height: "auto",
+                calcHeight: 30,
+                tip: false,
+                searchShow: true,
+                searchMenuSpan: 6,
+                border: false,
+                index: true,
+                // align: center,
+                stripe: true,
+                viewBtn: true,
+                selection: true,
+                dialogClickModal: false,
+                column: [
+                    {
+                        label: "附件地址",
+                        prop: "link",
+                        rules: [
+                            {
+                                required: true,
+                                message: "请输入附件地址",
+                                trigger: "blur",
+                            },
+                        ],
+                    },
+                    {
+                        label: "附件域名",
+                        prop: "domain",
+                        search: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: "请输入附件域名",
+                                trigger: "blur",
+                            },
+                        ],
+                    },
+                    {
+                        label: "附件名称",
+                        prop: "name",
+                        search: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: "请输入附件名称",
+                                trigger: "blur",
+                            },
+                        ],
+                    },
+                    {
+                        label: "附件原名",
+                        prop: "originalName",
+                        search: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: "请输入附件原名",
+                                trigger: "blur",
+                            },
+                        ],
+                    },
+                    {
+                        label: "附件拓展名",
+                        prop: "extension",
+                        rules: [
+                            {
+                                required: true,
+                                message: "请输入附件拓展名",
+                                trigger: "blur",
+                            },
+                        ],
+                    },
+                    {
+                        label: "附件大小",
+                        prop: "attachSize",
+                        slot: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: "请输入附件大小",
+                                trigger: "blur",
+                            },
+                        ],
+                    },
+                ],
+            },
+            data: [],
+            attachForm: {},
+            attachOption: {
+                submitBtn: false,
+                emptyBtn: false,
+                column: [
+                    {
+                        label: "附件上传",
+                        prop: "attachFile",
+                        type: "upload",
+                        drag: true,
+                        loadText: "模板上传中,请稍等",
+                        span: 24,
+                        propsHttp: {
+                            res: "data",
+                        },
+                        action:
+                            "/api/blade-resource/oss/endpoint/put-file-attach?type=" +
+                            type +
+                            "&deptid=" +
+                            deptid +
+                            "&noticeId=" +
+                            noticeId
 
-          },
-        ],
-      },
-    };
-  },
-  computed: {
-    ...mapGetters(["permission"]),
-    permissionList() {
-      return {
-        addBtn: false,
-        editBtn: false,
-        viewBtn: false,
-        delBtn: this.vaildData(this.permission.attach_delete, false),
-      };
+                    },
+                ],
+            },
+
+            imgSee: false,
+            imgUrl: ""
+        };
     },
-    ids() {
-      let ids = [];
-      this.selectionList.forEach((ele) => {
-        ids.push(ele.id);
-      });
-      return ids.join(",");
+    computed: {
+        ...mapGetters(["permission"]),
+        permissionList () {
+            return {
+                addBtn: false,
+                editBtn: false,
+                viewBtn: false,
+                delBtn: this.vaildData(this.permission.attach_delete, false),
+            };
+        },
+        ids () {
+            let ids = [];
+            this.selectionList.forEach((ele) => {
+                ids.push(ele.id);
+            });
+            return ids.join(",");
+        },
     },
-  },
-  mounted() {
-    var flag = false,
-      i = 0,
-      ind = null;
-    this.$store.state.tags.tagList.forEach((item, index) => {
-      if (item.label == "通知公告>附件上传") {
-        if (flag == false) {
-          ind = index;
-          flag = true;
+    mounted () {
+        var flag = false,
+            i = 0,
+            ind = null;
+        this.$store.state.tags.tagList.forEach((item, index) => {
+            if (item.label == "通知公告>附件上传") {
+                if (flag == false) {
+                    ind = index;
+                    flag = true;
+                }
+                i++;
+            }
+        });
+        if (i > 1) {
+            this.$store.state.tags.tagList.splice(ind, 1);
         }
-        i++;
-      }
-    });
-    if (i > 1) {
-      this.$store.state.tags.tagList.splice(ind, 1);
-    }
-  },
-  methods: {
-    handleUpload() {
-      this.attachBox = true;
     },
-    uploadAfter(res, done, loading, column) {
-      window.console.log(column);
-      this.attachBox = false;
-      this.refreshChange();
-      done();
+    methods: {
+        handleUpload () {
+            this.attachBox = true;
+        },
+        uploadAfter (res, done, loading, column) {
+            window.console.log(column);
+            this.attachBox = false;
+            this.refreshChange();
+            done();
+        },
+        handleDownload (row) {
+            window.open(`${row.link}`);
+        },
+        rowDel (row) {
+            this.$confirm("确定将选择数据删除?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    return remove(row.id);
+                })
+                .then(() => {
+                    this.onLoad(this.page);
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!",
+                    });
+                });
+        },
+        handleDelete () {
+            if (this.selectionList.length === 0) {
+                this.$message.warning("请选择至少一条数据");
+                return;
+            }
+            this.$confirm("确定将选择数据删除?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    return remove(this.ids);
+                })
+                .then(() => {
+                    this.onLoad(this.page);
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!",
+                    });
+                    this.$refs.crud.toggleSelection();
+                });
+        },
+        beforeOpen (done, type) {
+            if (["edit", "view"].includes(type)) {
+                getDetail(this.form.id).then((res) => {
+                    this.form = res.data.data;
+                });
+            }
+            done();
+        },
+        searchReset () {
+            this.query = {};
+            this.onLoad(this.page);
+        },
+        searchChange (params, done) {
+            this.query = params;
+            this.page.currentPage = 1;
+            this.onLoad(this.page, params);
+            done();
+        },
+        selectionChange (list) {
+            this.selectionList = list;
+        },
+        selectionClear () {
+            this.selectionList = [];
+            this.$refs.crud.toggleSelection();
+        },
+        currentChange (currentPage) {
+            this.page.currentPage = currentPage;
+        },
+        sizeChange (pageSize) {
+            this.page.pageSize = pageSize;
+        },
+        refreshChange () {
+            this.onLoad(this.page, this.query);
+        },
+        onLoad (page, params = {}) {
+            params.type = 4;
+            params.deptid = this.$route.query.deptId;
+            params.noticeId = this.$route.query.noticeId;
+            this.loading = true;
+            getList(
+                page.currentPage,
+                page.pageSize,
+                Object.assign(params, this.query)
+            ).then((res) => {
+                const data = res.data.data;
+                this.page.total = data.total;
+                this.data = data.records;
+                console.log(this.data);
+                this.loading = false;
+                this.selectionClear();
+            });
+        },
+
+        seeImages (row) {
+            this.imgUrl = "";
+            this.imgUrl = "url(" + row.link + ") center center / contain no-repeat";
+
+            this.imgSee = true;
+        },
+
+        fileFormat (row) {
+            var index = row.link.lastIndexOf(".");
+            var ext = row.link.substr(index + 1);
+
+            return [
+                'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].
+                indexOf(ext.toLowerCase()) == -1;
+        }
     },
-    handleDownload(row) {
-      window.open(`${row.link}`);
-    },
-    rowDel(row) {
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          return remove(row.id);
-        })
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!",
-          });
-        });
-    },
-    handleDelete() {
-      if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
-        return;
-      }
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          return remove(this.ids);
-        })
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!",
-          });
-          this.$refs.crud.toggleSelection();
-        });
-    },
-    beforeOpen(done, type) {
-      if (["edit", "view"].includes(type)) {
-        getDetail(this.form.id).then((res) => {
-          this.form = res.data.data;
-        });
-      }
-      done();
-    },
-    searchReset() {
-      this.query = {};
-      this.onLoad(this.page);
-    },
-    searchChange(params, done) {
-      this.query = params;
-      this.page.currentPage = 1;
-      this.onLoad(this.page, params);
-      done();
-    },
-    selectionChange(list) {
-      this.selectionList = list;
-    },
-    selectionClear() {
-      this.selectionList = [];
-      this.$refs.crud.toggleSelection();
-    },
-    currentChange(currentPage) {
-      this.page.currentPage = currentPage;
-    },
-    sizeChange(pageSize) {
-      this.page.pageSize = pageSize;
-    },
-    refreshChange() {
-      this.onLoad(this.page, this.query);
-    },
-    onLoad(page, params = {}) {
-      params.type = 4;
-      params.deptid = this.$route.query.deptId;
-      params.noticeId = this.$route.query.noticeId;
-      this.loading = true;
-      getList(
-        page.currentPage,
-        page.pageSize,
-        Object.assign(params, this.query)
-      ).then((res) => {
-        const data = res.data.data;
-        this.page.total = data.total;
-        this.data = data.records;
-        console.log(this.data);
-        this.loading = false;
-        this.selectionClear();
-      });
-    },
-  },
 };
 </script>
 
diff --git a/src/views/trainExam/performance.vue b/src/views/trainExam/performance.vue
new file mode 100644
index 0000000..d077e07
--- /dev/null
+++ b/src/views/trainExam/performance.vue
@@ -0,0 +1,492 @@
+/*
+ * @Author: Morpheus
+ * @Date: 2021-07-05 16:31:54
+ * @Last Modified by: Morpheus
+ * @Last Modified time: 2021-07-18 19:44:47
+ * menu-name 成绩管理
+ */
+<template>
+  <el-row class="morpheus-box">
+    <el-col :span="24" class="recruitmentManagement">
+      <el-card>
+        <div class="exam-card-body">
+          <avue-crud
+            v-model="obj"
+            class="company-box"
+            :option="questionBankOption"
+            :search.sync="questionBankSearch"
+            :table-loading="questionBankLoading"
+            :data="questionBankData"
+            ref="questionBankCrud"
+            :page.sync="questionBankPage"
+            @on-load="questionBankOnLoad"
+            @selection-change="questionBankSelectionChange"
+            @search-change="questionBankSearchChange"
+            @search-reset="questionBankSearchReset"
+            @current-change="questionBankCurrentChange"
+            @size-change="questionBankSizeChange"
+            @row-update="questionBankRowUpdate"
+          >
+            <template slot-scope="{ row }" slot="learnGrade">
+              {{ row.learnGrade == -1 ? "暂未录入" : row.learnGrade }}
+            </template>
+
+            <!-- 自定义按钮 -->
+            <template slot="menuLeft">
+              <!-- <el-button type="danger"
+                                       size="mini"
+                                       icon="el-icon-delete"
+                                       plain
+                                       @click="handleDelete">新增
+                            </el-button> -->
+              <!-- <el-button type="danger"
+                                       size="mini"
+                                       icon="el-icon-delete"
+                                       plain
+                                       @click="handleDelete">删除
+                            </el-button> -->
+              <el-button
+                type="success"
+                size="small"
+                plain
+                icon="el-icon-upload2"
+                @click="handleImport"
+                >实操成绩导入
+              </el-button>
+            </template>
+          </avue-crud>
+
+          <el-dialog
+            title="实操成绩导入"
+            append-to-body
+            :visible.sync="excelBox"
+            width="555px"
+          >
+            <avue-form
+              :option="excelOption"
+              v-model="excelForm"
+              :upload-after="uploadAfter"
+            >
+              <template slot="excelTemplate">
+                <el-button type="primary" @click="handleTemplate">
+                  点击下载<i class="el-icon-download el-icon--right"></i>
+                </el-button>
+              </template>
+            </avue-form>
+          </el-dialog>
+        </div>
+      </el-card>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { getList, update } from "@/api/examapi/performance";
+
+export default {
+  data() {
+    var validatePass = (rule, value, callback) => {
+      console.log(value);
+      if (value == undefined || value == "") {
+        callback(new Error("请输入实操成绩"));
+        return;
+      } else if (value !== "" && isNaN(value) == true) {
+        callback(new Error("请输入数字"));
+      } else if (value <= 0) {
+        callback(new Error("分数设置请大于0"));
+      } else if (value > 100) {
+        callback(new Error("分数设置请小于100"));
+      } else {
+        callback();
+      }
+    };
+
+    return {
+      obj: {
+        name: "张三",
+      },
+      excelBox: false,
+      questionBankOption: {
+        // 操作栏多余按钮去除
+        delBtn: false,
+        editBtn: true,
+        addBtn: false,
+        selection: false,
+        // 导出按钮
+        excelBtn: true,
+        excelBtnText: "成绩导出",
+        viewBtn: true,
+        // title: '成绩',
+        align: "center",
+        height: "auto",
+        calcHeight: 80,
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 4,
+        index: true,
+        indexLabel: "序号",
+        //dialogType: 'drawer',
+        dialogClickModal: false,
+        // 操作栏宽度
+        menu: true,
+        menuWidth: 136,
+        labelWidth: 120,
+
+        column: [
+          {
+            label: "试卷名称",
+            prop: "examName",
+            search: true,
+            searchSpan: 4,
+            slot: true,
+            // 表单新增时是否禁止
+            addDisabled: false,
+            // 表单新增时是否可见
+            addDisplay: true,
+            // 表单新增时是否为查看模式
+            addDetail: false,
+            // 表单编辑时是否禁止
+            editDisabled: true,
+            // 表单编辑时是否可见
+            editDisplay: true,
+            // 表单编辑时是否为查看模式
+            editDetail: false,
+            rules: [
+              {
+                required: true,
+                message: "请输入试卷名称",
+                trigger: "blur",
+              },
+            ],
+            overHidden:true,
+          },
+          {
+            label: "保安姓名",
+            prop: "securityName",
+            search: true,
+            searchSpan: 4,
+            slot: true,
+            // 表单新增时是否禁止
+            addDisabled: false,
+            // 表单新增时是否可见
+            addDisplay: true,
+            // 表单新增时是否为查看模式
+            addDetail: false,
+            // 表单编辑时是否禁止
+            editDisabled: true,
+            // 表单编辑时是否可见
+            editDisplay: true,
+            // 表单编辑时是否为查看模式
+            editDetail: false,
+            rules: [
+              {
+                required: true,
+                message: "请输入保安姓名",
+                trigger: "blur",
+              },
+            ],
+          },
+          {
+            label: "所属公司",
+            prop: "companyName",
+            search: true,
+            searchSpan: 4,
+            // dicUrl: '/api/blade-system/dept/tree',
+            // props: {
+            //     label: "title",
+            //     value: "id",
+            // },
+            slot: true,
+            // 表单新增时是否禁止
+            addDisabled: false,
+            // 表单新增时是否可见
+            addDisplay: true,
+            // 表单新增时是否为查看模式
+            addDetail: false,
+            // 表单编辑时是否禁止
+            editDisabled: true,
+            // 表单编辑时是否可见
+            editDisplay: true,
+            // 表单编辑时是否为查看模式
+            editDetail: false,
+            rules: [
+              {
+                required: true,
+                message: "请输入所属公司",
+                trigger: "blur",
+              },
+            ],
+          },
+          {
+            label: "考试时间",
+            prop: "examTime",
+            type: "datetime",
+            // span: 24,
+            format: "yyyy-MM-dd HH:mm:ss",
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
+            width: 250,
+            slot: true,
+            // 表单新增时是否禁止
+            addDisabled: false,
+            // 表单新增时是否可见
+            addDisplay: true,
+            // 表单新增时是否为查看模式
+            addDetail: false,
+            // 表单编辑时是否禁止
+            editDisabled: true,
+            // 表单编辑时是否可见
+            editDisplay: true,
+            // 表单编辑时是否为查看模式
+            editDetail: false,
+          },
+          {
+            label: "理论成绩",
+            prop: "theoryGrade",
+            slot: true,
+            // 表单新增时是否禁止
+            addDisabled: false,
+            // 表单新增时是否可见
+            addDisplay: true,
+            // 表单新增时是否为查看模式
+            addDetail: false,
+            // 表单编辑时是否禁止
+            editDisabled: true,
+            // 表单编辑时是否可见
+            editDisplay: true,
+            // 表单编辑时是否为查看模式
+            editDetail: false,
+          },
+          {
+            label: "实操成绩",
+            prop: "learnGrade",
+            slot: true,
+            // 表单新增时是否禁止
+            addDisabled: false,
+            // 表单新增时是否可见
+            addDisplay: true,
+            // 表单新增时是否为查看模式
+            addDetail: false,
+            // 表单编辑时是否禁止
+            editDisabled: false,
+            // 表单编辑时是否可见
+            editDisplay: true,
+            // 表单编辑时是否为查看模式
+            editDetail: false,
+            rules: [
+              { validator: validatePass, required: true, trigger: "blur" },
+            ],
+          },
+          {
+              label: "总成绩",
+              prop: "allGrade",
+              slot: true,
+              // hide:true,
+              // 表单新增时是否禁止
+              addDisabled: false,
+              viewDisplay:false,
+              // 表单新增时是否可见
+              addDisplay: false,
+              // 表单新增时是否为查看模式
+              addDetail: false,
+              // 表单编辑时是否禁止
+              editDisabled: false,
+              // 表单编辑时是否可见
+              editDisplay: false,
+              // 表单编辑时是否为查看模式
+              editDetail: false,
+              rules: [{
+                  required: true,
+                  message: "请输入考试名称",
+                  trigger: "blur"
+              }]
+          },
+          {
+            label: "是否合格",
+            prop: "qualified",
+            type: "select",
+            slot: true,
+            search: true,
+            searchSpan: 4,
+            dicData: [
+              {
+                label: "合格",
+                value: 0,
+              },
+              {
+                label: "不合格",
+                value: 1,
+              },
+              {
+                label: "暂未录实操成绩",
+                value: 2,
+              },
+            ],
+            // 表单新增时是否禁止
+            addDisabled: false,
+            // 表单新增时是否可见
+            addDisplay: true,
+            // 表单新增时是否为查看模式
+            addDetail: false,
+            // 表单编辑时是否禁止
+            editDisabled: true,
+            // 表单编辑时是否可见
+            editDisplay: true,
+            // 表单编辑时是否为查看模式
+            editDetail: false,
+            rules: [
+              {
+                required: true,
+                message: "请输入考试名称",
+                trigger: "blur",
+              },
+            ],
+          },
+        ],
+      },
+      questionBankSearch: {},
+      questionBankLoading: true,
+      questionBankData: [],
+      questionBankPage: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 16,
+      },
+      questionBankQuery: {},
+      questionBankSelectionList: [],
+      excelForm: {},
+      excelOption: {
+        submitBtn: false,
+        emptyBtn: false,
+        column: [
+          {
+            label: "模板上传",
+            prop: "excelFile",
+            type: "upload",
+            drag: true,
+            loadText: "模板上传中,请稍等",
+            span: 24,
+            propsHttp: {
+              res: "data",
+            },
+            tip: "请上传 .xls,.xlsx 标准格式文件",
+            action: "/api/examScore/import-examScore",
+          },
+          // {
+          //     label: "数据覆盖",
+          //     prop: "isCovered",
+          //     type: "switch",
+          //     align: "center",
+          //     width: 80,
+          //     dicData: [
+          //     {
+          //         label: "否",
+          //         value: 0,
+          //     },
+          //     {
+          //         label: "是",
+          //         value: 1,
+          //     },
+          //     ],
+          //     value: 0,
+          //     slot: true,
+          //     rules: [
+          //     {
+          //         required: true,
+          //         message: "请选择是否覆盖",
+          //         trigger: "blur",
+          //     },
+          //     ],
+          // },
+          {
+            label: "模板下载",
+            prop: "excelTemplate",
+            formslot: true,
+            span: 24,
+          },
+        ],
+      },
+    };
+  },
+  created() {},
+  mounted() {},
+  methods: {
+    questionBankOnLoad(page, params = {}) {
+      this.questionBankLoading = false;
+      params["examType"] = 2;
+      getList(
+        page.currentPage,
+        page.pageSize,
+        Object.assign(params, this.query)
+      ).then((res) => {
+        const data = res.data.data;
+        this.questionBankPage.total = data.total;
+        this.questionBankData = data.records;
+        this.questionBankLoading = false;
+        this.questionBankSelectionClear();
+      });
+    },
+    questionBankSelectionClear() {
+      this.questionBankSelectionList = [];
+      this.$refs.questionBankCrud.toggleSelection();
+    },
+    questionBankSelectionChange(list) {
+      this.questionBankSelectionList = list;
+    },
+    questionBankSearchChange(params, done) {
+      this.questionBankQuery = params;
+      this.questionBankPage.currentPage = 1;
+      this.questionBankOnLoad(this.questionBankPage, params);
+      done();
+    },
+    questionBankSearchReset() {
+      this.questionBankQuery = {};
+      this.questionBankOnLoad(this.questionBankPage);
+    },
+    questionBankCurrentChange(currentPage) {
+      this.questionBankPage.currentPage = currentPage;
+    },
+    questionBankSizeChange(pageSize) {
+      this.questionBankPage.pageSize = pageSize;
+    },
+
+    questionBankRowUpdate(row, index, done, loading) {
+      update({
+        theoryGrade: row.theoryGrade,
+        learnGrade: row.learnGrade,
+        id: row.id,
+      }).then(
+        () => {
+          this.questionBankOnLoad(this.questionBankPage);
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+          done();
+        },
+        (error) => {
+          window.console.log(error);
+          loading();
+        }
+      );
+    },
+    handleTemplate() {
+      window.open(`/api/examScore/export-template`);
+    },
+    handleImport() {
+      this.excelBox = true;
+    },
+    uploadAfter(res, done, loading, column) {
+      window.console.log(column);
+      this.excelBox = false;
+      this.refreshChange();
+      done();
+    },
+    refreshChange() {
+      this.questionBankOnLoad(this.page, this.query);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/trainExam/singleperformance.vue b/src/views/trainExam/singleperformance.vue
new file mode 100644
index 0000000..ebaa576
--- /dev/null
+++ b/src/views/trainExam/singleperformance.vue
@@ -0,0 +1,423 @@
+/*
+ * @Author: Morpheus
+ * @Date: 2021-07-05 16:31:54
+ * @Last Modified by: Morpheus
+ * @Last Modified time: 2021-07-18 21:02:10
+ * menu-name 成绩查看
+ */
+<template>
+  <el-row class="morpheus-box-score">
+    <el-col :span="24">
+      <el-card>
+        <div class="exam-card-body">
+          <avue-crud
+            v-model="obj"
+            class="company-box"
+            :option="questionBankOption"
+            :search.sync="questionBankSearch"
+            :table-loading="questionBankLoading"
+            :data="questionBankData"
+            ref="questionBankCrud"
+            :page.sync="questionBankPage"
+            @on-load="questionBankOnLoad"
+            @selection-change="questionBankSelectionChange"
+            @search-change="questionBankSearchChange"
+            @search-reset="questionBankSearchReset"
+            @current-change="questionBankCurrentChange"
+            @size-change="questionBankSizeChange"
+            @row-update="questionBankRowUpdate"
+          >
+            <template slot-scope="{ row }" slot="learnGrade">
+              {{ row.learnGrade == -1 ? "暂未录入" : row.learnGrade }}
+            </template>
+
+            <template slot-scope="{ row }" slot="menu">
+              <el-button
+                type="text"
+                size="mini"
+                icon="el-icon-collection"
+                class="start-kaoshi"
+                :disabled="row.qualified==1"
+                @click="securityPrint(row)"
+                >保安证打印
+              </el-button>
+            </template>
+
+            <!-- 自定义按钮 -->
+            <!-- <template slot="menuLeft">
+                            <el-button type="danger"
+                                       size="mini"
+                                       icon="el-icon-delete"
+                                       plain
+                                       @click="handleDelete">新增
+                            </el-button>
+                            <el-button type="danger"
+                                       size="mini"
+                                       icon="el-icon-delete"
+                                       plain
+                                       @click="handleDelete">删除
+                            </el-button>
+                            <el-button type="danger"
+                                       size="mini"
+                                       icon="el-icon-delete"
+                                       plain
+                                       @click="handleDelete">导出
+                            </el-button>
+                        </template> -->
+          </avue-crud>
+        </div>
+      </el-card>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { getList, update } from "@/api/examapi/performance";
+
+export default {
+  data() {
+    var validatePass = (rule, value, callback) => {
+      console.log(value);
+      if (value == undefined || value == "") {
+        callback(new Error("请输入实操成绩"));
+        return;
+      } else if (value !== "" && isNaN(value) == true) {
+        callback(new Error("请输入数字"));
+      } else if (value <= 0) {
+        callback(new Error("分数设置请大于0"));
+      } else if (value > 100) {
+        callback(new Error("分数设置请小于100"));
+      } else {
+        callback();
+      }
+    };
+
+    return {
+      obj: {
+        name: "张三",
+      },
+      questionBankOption: {
+        // 操作栏多余按钮去除
+        delBtn: false,
+        editBtn: false,
+        addBtn: false,
+        selection: false,
+        // 导出按钮
+        excelBtn: true,
+        excelBtnText: "成绩导出",
+        viewBtn: false,
+        // title: '成绩',
+
+        align: "center",
+        height: "auto",
+        calcHeight: 80,
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 4,
+        index: true,
+        indexLabel: "序号",
+        //dialogType: 'drawer',
+        dialogClickModal: false,
+        // 操作栏宽度
+        menu: false,
+        menuWidth: 136,
+        labelWidth: 120,
+        column: [
+          {
+            label: "考试名称",
+            prop: "examName",
+            search: true,
+            searchSpan: 4,
+            slot: true,
+            viewDisplay:false,
+            // 表单新增时是否禁止
+            addDisabled: false,
+            // 表单新增时是否可见
+            addDisplay: true,
+            // 表单新增时是否为查看模式
+            addDetail: false,
+            // 表单编辑时是否禁止
+            editDisabled: false,
+            // 表单编辑时是否可见
+            editDisplay: false,
+            // 表单编辑时是否为查看模式
+            editDetail: false,
+            rules: [
+              {
+                required: true,
+                message: "请输入试卷名称",
+                trigger: "blur",
+              },
+            ],
+            overHidden:true,
+          },
+          {
+            label: "保安姓名",
+            prop: "securityName",
+            search: true,
+            searchSpan: 4,
+            slot: true,
+            // 表单新增时是否禁止
+            addDisabled: false,
+            // 表单新增时是否可见
+            addDisplay: true,
+            // 表单新增时是否为查看模式
+            addDetail: false,
+            // 表单编辑时是否禁止
+            editDisabled: true,
+            // 表单编辑时是否可见
+            editDisplay: true,
+            // 表单编辑时是否为查看模式
+            editDetail: false,
+            rules: [
+              {
+                required: true,
+                message: "请输入保安姓名",
+                trigger: "blur",
+              },
+            ],
+          },
+          {
+            label: "所属公司",
+            prop: "companyName",
+            search: true,
+            searchSpan: 4,
+            // dicUrl: '/api/blade-system/dept/tree',
+            // props: {
+            //     label: "title",
+            //     value: "id",
+            // },
+            slot: true,
+            // 表单新增时是否禁止
+            addDisabled: false,
+            // 表单新增时是否可见
+            addDisplay: true,
+            // 表单新增时是否为查看模式
+            addDetail: false,
+            // 表单编辑时是否禁止
+            editDisabled: true,
+            // 表单编辑时是否可见
+            editDisplay: true,
+            // 表单编辑时是否为查看模式
+            editDetail: false,
+            rules: [
+              {
+                required: true,
+                message: "请输入所属公司",
+                trigger: "blur",
+              },
+            ],
+          },
+          {
+            label: "考试时间",
+            prop: "examTime",
+            type: "datetime",
+            // span: 24,
+            format: "yyyy-MM-dd HH:mm:ss",
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
+            width: 250,
+            slot: true,
+            // 表单新增时是否禁止
+            addDisabled: false,
+            // 表单新增时是否可见
+            addDisplay: true,
+            // 表单新增时是否为查看模式
+            addDetail: false,
+            // 表单编辑时是否禁止
+            editDisabled: true,
+            // 表单编辑时是否可见
+            editDisplay: true,
+            // 表单编辑时是否为查看模式
+            editDetail: false,
+          },
+          {
+            label: "理论成绩",
+            prop: "theoryGrade",
+            slot: true,
+            // 表单新增时是否禁止
+            addDisabled: false,
+            // 表单新增时是否可见
+            addDisplay: true,
+            // 表单新增时是否为查看模式
+            addDetail: false,
+            // 表单编辑时是否禁止
+            editDisabled: true,
+            // 表单编辑时是否可见
+            editDisplay: true,
+            // 表单编辑时是否为查看模式
+            editDetail: false,
+          },
+          {
+            label: "实操成绩",
+            prop: "learnGrade",
+            slot: true,
+            // 表单新增时是否禁止
+            addDisabled: false,
+            // 表单新增时是否可见
+            addDisplay: true,
+            // 表单新增时是否为查看模式
+            addDetail: false,
+            // 表单编辑时是否禁止
+            editDisabled: false,
+            // 表单编辑时是否可见
+            editDisplay: true,
+            // 表单编辑时是否为查看模式
+            editDetail: false,
+            rules: [
+              { validator: validatePass, required: true, trigger: "blur" },
+            ],
+          },
+          {
+              label: "总成绩",
+              prop: "allGrade",
+              slot: true,
+              // 表单新增时是否禁止
+              addDisabled: false,
+              // 表单新增时是否可见
+              addDisplay: true,
+              // 表单新增时是否为查看模式
+              addDetail: false,
+              // 表单编辑时是否禁止
+              editDisabled: true,
+              // 表单编辑时是否可见
+              editDisplay: true,
+              // 表单编辑时是否为查看模式
+              editDetail: false,
+              rules: [{
+                  required: true,
+                  message: "请输入考试名称",
+                  trigger: "blur"
+              }]
+          },
+          {
+            label: "是否合格",
+            prop: "qualified",
+            type: "select",
+            slot: true,
+            search: true,
+            searchSpan: 4,
+            dicData: [
+              {
+                label: "合格",
+                value: 0,
+              },
+              {
+                label: "不合格",
+                value: 1,
+              },
+              {
+                label: "暂未录实操成绩",
+                value: 2,
+              },
+            ],
+            // 表单新增时是否禁止
+            addDisabled: false,
+            // 表单新增时是否可见
+            addDisplay: true,
+            // 表单新增时是否为查看模式
+            addDetail: false,
+            // 表单编辑时是否禁止
+            editDisabled: true,
+            // 表单编辑时是否可见
+            editDisplay: true,
+            // 表单编辑时是否为查看模式
+            editDetail: false,
+            rules: [
+              {
+                required: true,
+                message: "请输入考试名称",
+                trigger: "blur",
+              },
+            ],
+          },
+        ],
+      },
+      questionBankSearch: {},
+      questionBankLoading: true,
+      questionBankData: [],
+      questionBankPage: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 16,
+      },
+      questionBankQuery: {},
+      questionBankSelectionList: [],
+    };
+  },
+  created() {},
+  mounted() {},
+  methods: {
+    //保安证证查看
+    securityPrint(row) {
+      var obj = row;
+      obj["name"] = "保安证";
+      this.$router.push({
+        path: `/exam/papers`,
+        query: obj,
+      });
+    },
+    questionBankOnLoad(page, params = {}) {
+      this.questionBankLoading = false;
+      params["examType"] = 2;
+      getList(
+        page.currentPage,
+        page.pageSize,
+        Object.assign(params, this.query)
+      ).then((res) => {
+        const data = res.data.data;
+        this.questionBankPage.total = data.total;
+        this.questionBankData = data.records;
+        this.questionBankLoading = false;
+        this.questionBankSelectionClear();
+      });
+    },
+    questionBankSelectionClear() {
+      this.questionBankSelectionList = [];
+      this.$refs.questionBankCrud.toggleSelection();
+    },
+    questionBankSelectionChange(list) {
+      this.questionBankSelectionList = list;
+    },
+    questionBankSearchChange(params, done) {
+      this.questionBankQuery = params;
+      this.questionBankPage.currentPage = 1;
+      this.questionBankOnLoad(this.questionBankPage, params);
+      done();
+    },
+    questionBankSearchReset() {
+      this.questionBankQuery = {};
+      this.questionBankOnLoad(this.questionBankPage);
+    },
+    questionBankCurrentChange(currentPage) {
+      this.questionBankPage.currentPage = currentPage;
+    },
+    questionBankSizeChange(pageSize) {
+      this.questionBankPage.pageSize = pageSize;
+    },
+
+    questionBankRowUpdate(row, index, done, loading) {
+      update({
+        theoryGrade: row.theoryGrade,
+        learnGrade: row.learnGrade,
+        id: row.id,
+      }).then(
+        () => {
+          this.questionBankOnLoad(this.questionBankPage);
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+          done();
+        },
+        (error) => {
+          window.console.log(error);
+          loading();
+        }
+      );
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/traincompany/index.vue b/src/views/traincompany/index.vue
index d7de7cb..b6ef7bf 100644
--- a/src/views/traincompany/index.vue
+++ b/src/views/traincompany/index.vue
@@ -3,7 +3,7 @@
  * @Date: 2021-07-07 17:30:05
  * @Last Modified by: Morpheus
  * @Last Modified time: 2021-07-10 16:06:14
- * menu-name 保安培训单位
+ * menu-name 保安培训报名
  */
 <template>
   <basic-container>
@@ -286,6 +286,7 @@
     submit(){
         batchTrain({
           userIds: this.formTrainApply.userId.join(","),
+          trainingUnitId: this.formTrainApply.trainingUnitId
         }).then(
           (res) => {
             this.onLoad(this.page);

--
Gitblit v1.9.3