yanliming 1 vuosi sitten
vanhempi
commit
f7f5cc134c
40 muutettua tiedostoa jossa 6 lisäystä ja 7862 poistoa
  1. 2 2
      .env.development
  2. 2 2
      .env.production
  3. 2 2
      .env.test
  4. 0 60
      src/api/base/enterpriseInfo.js
  5. 0 48
      src/api/base/jobEnterpriseRelation.js
  6. 0 52
      src/api/base/jobInformationInfo.js
  7. 0 55
      src/api/base/mobileBannerInfo.js
  8. 0 51
      src/api/base/newsInfo.js
  9. 0 51
      src/api/base/personInfo.js
  10. 0 60
      src/api/base/recruitInformationInfo.js
  11. 0 57
      src/api/base/recruitPersonRelation.js
  12. 0 52
      src/api/base/shareWorksInfo.js
  13. 0 52
      src/api/base/trainingInfo.js
  14. 0 47
      src/api/base/trainingPerson.js
  15. 0 47
      src/api/statistical/generateReport.js
  16. 0 19
      src/api/statistical/report.js
  17. 0 96
      src/routers/modules/base.js
  18. 0 36
      src/routers/modules/statistical.js
  19. 0 240
      src/views/base/enterpriseInfo-detail.vue
  20. 0 470
      src/views/base/enterpriseInfo-list.vue
  21. 0 173
      src/views/base/jobEnterpriseRelation-list.vue
  22. 0 485
      src/views/base/jobInformationInfo-list.vue
  23. 0 264
      src/views/base/mobileBannerInfo-detail.vue
  24. 0 406
      src/views/base/mobileBannerInfo-list.vue
  25. 0 277
      src/views/base/newsInfo-detail.vue
  26. 0 338
      src/views/base/newsInfo-list.vue
  27. 0 260
      src/views/base/personInfo-detail.vue
  28. 0 500
      src/views/base/personInfo-list.vue
  29. 0 368
      src/views/base/recruitInformationInfo-detail.vue
  30. 0 703
      src/views/base/recruitInformationInfo-list.vue
  31. 0 156
      src/views/base/recruitPersonRelation-detail.vue
  32. 0 207
      src/views/base/recruitPersonRelation-list.vue
  33. 0 218
      src/views/base/shareWorksInfo-detail.vue
  34. 0 308
      src/views/base/shareWorksInfo-list.vue
  35. 0 365
      src/views/base/trainingInfo-detail.vue
  36. 0 349
      src/views/base/trainingInfo-list.vue
  37. 0 177
      src/views/base/trainingPerson-list.vue
  38. 0 274
      src/views/statistical/dailyGroupReport-list.vue
  39. 0 257
      src/views/statistical/dailyReport-list.vue
  40. 0 278
      src/views/statistical/generateReport-list.vue

+ 2 - 2
.env.development

@@ -1,3 +1,3 @@
-OUT_PUT_DIR=dist/jk-temporary-workers-portal
+OUT_PUT_DIR=dist/love-donation-portal
 
-VUE_APP_BACKEND_URL=http://127.0.0.1:8086/jk-temporary-workers-server
+VUE_APP_BACKEND_URL=http://127.0.0.1:8086/love-donation-server

+ 2 - 2
.env.production

@@ -1,4 +1,4 @@
-OUT_PUT_DIR=dist/jk-temporary-workers-portal
+OUT_PUT_DIR=dist/love-donation-portal
 
-VUE_APP_BACKEND_URL=https://equipment.xiaoxinda.com/jk-temporary-workers-server
+VUE_APP_BACKEND_URL=https://equipment.xiaoxinda.com/love-donation-server
 #VUE_APP_BACKEND_URL=https://mirror.xiaoxinda.com/xpgjapi/

+ 2 - 2
.env.test

@@ -1,3 +1,3 @@
-OUT_PUT_DIR=dist/jp-employment-portal
+OUT_PUT_DIR=dist/love-donation-portal
 
-VUE_APP_BACKEND_URL=https://ykt-test.xiaoxinda.com/jp-housekeeper-server/
+VUE_APP_BACKEND_URL=https://ykt-test.xiaoxinda.com/love-donation-server/

+ 0 - 60
src/api/base/enterpriseInfo.js

@@ -1,60 +0,0 @@
-import request from '@/utils/request'
-import constant from '@/constant'
-
-function pageList(formData) {
-  return request.post(constant.serverUrl + "/base/enterpriseInfo/pageList", formData);
-}
-
-function list() {
-  return request.post(constant.serverUrl + "/base/enterpriseInfo/list");
-}
-
-function create() {
-  return request.get(constant.serverUrl + "/base/enterpriseInfo/create");
-}
-
-function edit(id) {
-  return request.get(constant.serverUrl + "/base/enterpriseInfo/edit/" + id);
-}
-
-function add(formModel) {
-  return request.post(constant.serverUrl + "/base/enterpriseInfo/add", formModel, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-function update(formModel) {
-  return request.post(constant.serverUrl + "/base/enterpriseInfo/update", formModel, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-function remove(id) {
-  return request.post(constant.serverUrl + "/base/enterpriseInfo/delete/" + id);
-}
-
-function batchRemove(idList) {
-  return request.post(constant.serverUrl + "/base/enterpriseInfo/batchDelete", idList, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-function check(id) {
-  return request.post(constant.serverUrl + "/base/enterpriseInfo/check/" + id);
-}
-
-function nameIsRepeatCheck(formData) {
-  return request.post(constant.serverUrl + "/base/enterpriseInfo/nameIsRepeatCheck", formData);
-}
-
-
-export default {
-  pageList, create, edit, add, update, remove, batchRemove,list,check,
-  nameIsRepeatCheck
-}

+ 0 - 48
src/api/base/jobEnterpriseRelation.js

@@ -1,48 +0,0 @@
-import request from '@/utils/request'
-import constant from '@/constant'
-
-function pageList(formData) {
-  return request.post(constant.serverUrl + "/base/jobEnterpriseRelation/pageList", formData);
-}
-
-function create() {
-  return request.get(constant.serverUrl + "/base/jobEnterpriseRelation/create");
-}
-
-function edit(id) {
-  return request.get(constant.serverUrl + "/base/jobEnterpriseRelation/edit/" + id);
-}
-
-function add(formModel) {
-  return request.post(constant.serverUrl + "/base/jobEnterpriseRelation/add", formModel, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-function update(formModel) {
-  return request.post(constant.serverUrl + "/base/jobEnterpriseRelation/update", formModel, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-function remove(id) {
-  return request.post(constant.serverUrl + "/base/jobEnterpriseRelation/delete/" + id);
-}
-
-
-function batchRemove(idList) {
-  return request.post(constant.serverUrl + "/base/jobEnterpriseRelation/batchDelete", idList, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-
-export default {
-  pageList, create, edit, add, update, remove, batchRemove
-}

+ 0 - 52
src/api/base/jobInformationInfo.js

@@ -1,52 +0,0 @@
-import request from '@/utils/request'
-import constant from '@/constant'
-
-function pageList(formData) {
-  return request.post(constant.serverUrl + "/base/jobInformationInfo/pageList", formData);
-}
-
-function create() {
-  return request.get(constant.serverUrl + "/base/jobInformationInfo/create");
-}
-
-function edit(id) {
-  return request.get(constant.serverUrl + "/base/jobInformationInfo/edit/" + id);
-}
-
-function add(formModel) {
-  return request.post(constant.serverUrl + "/base/jobInformationInfo/add", formModel, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-function update(formModel) {
-  return request.post(constant.serverUrl + "/base/jobInformationInfo/update", formModel, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-function remove(id) {
-  return request.post(constant.serverUrl + "/base/jobInformationInfo/delete/" + id);
-}
-
-
-function batchRemove(idList) {
-  return request.post(constant.serverUrl + "/base/jobInformationInfo/batchDelete", idList, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-function check(id) {
-  return request.post(constant.serverUrl + "/base/jobInformationInfo/check/" + id);
-}
-
-
-export default {
-  pageList, create, edit, add, update, remove, batchRemove,check
-}

+ 0 - 55
src/api/base/mobileBannerInfo.js

@@ -1,55 +0,0 @@
-import request from '@/utils/request'
-import constant from '@/constant'
-
-function pageList(formData) {
-  return request.post(constant.serverUrl + "/base/mobileBannerInfo/pageList", formData);
-}
-
-function create() {
-  return request.get(constant.serverUrl + "/base/mobileBannerInfo/create");
-}
-
-function edit(id) {
-  return request.get(constant.serverUrl + "/base/mobileBannerInfo/edit/" + id);
-}
-
-function add(formModel) {
-  return request.post(constant.serverUrl + "/base/mobileBannerInfo/add", formModel, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-function update(formModel) {
-  return request.post(constant.serverUrl + "/base/mobileBannerInfo/update", formModel, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-function remove(id) {
-  return request.post(constant.serverUrl + "/base/mobileBannerInfo/delete/" + id);
-}
-
-
-function batchRemove(idList) {
-  return request.post(constant.serverUrl + "/base/mobileBannerInfo/batchDelete", idList, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-function checkBannerInfo(formModel) {
-    return request.post(constant.serverUrl + "/base/mobileBannerInfo/checkBannerInfo", formModel, {
-      headers: {
-        "Content-Type": "application/json"
-      }
-    });
-  }
-
-export default {
-  pageList, create, edit, add, update, remove, batchRemove,checkBannerInfo
-}

+ 0 - 51
src/api/base/newsInfo.js

@@ -1,51 +0,0 @@
-import request from '@/utils/request'
-import constant from '@/constant'
-
-function pageList(formData) {
-  return request.post(constant.serverUrl + "/base/newsInfo/pageList", formData);
-}
-
-function create() {
-  return request.get(constant.serverUrl + "/base/newsInfo/create");
-}
-
-function edit(id) {
-  return request.get(constant.serverUrl + "/base/newsInfo/edit/" + id);
-}
-
-function add(formModel) {
-  return request.post(constant.serverUrl + "/base/newsInfo/add", formModel, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-function update(formModel) {
-  return request.post(constant.serverUrl + "/base/newsInfo/update", formModel, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-function remove(id) {
-  return request.post(constant.serverUrl + "/base/newsInfo/delete/" + id);
-}
-
-function batchRemove(idList) {
-  return request.post(constant.serverUrl + "/base/newsInfo/batchDelete", idList, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-function check(id) {
-  return request.post(constant.serverUrl + "/base/newsInfo/check/" + id);
-}
-
-
-export default {
-  pageList, create, edit, add, update, remove, batchRemove,check
-}

+ 0 - 51
src/api/base/personInfo.js

@@ -1,51 +0,0 @@
-import request from '@/utils/request'
-import constant from '@/constant'
-
-function pageList(formData) {
-  return request.post(constant.serverUrl + "/base/personInfo/pageList", formData);
-}
-
-function create() {
-  return request.get(constant.serverUrl + "/base/personInfo/create");
-}
-
-function edit(id) {
-  return request.get(constant.serverUrl + "/base/personInfo/edit/" + id);
-}
-
-function add(formModel) {
-  return request.post(constant.serverUrl + "/base/personInfo/add", formModel, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-function update(formModel) {
-  return request.post(constant.serverUrl + "/base/personInfo/update", formModel, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-function remove(id) {
-  return request.post(constant.serverUrl + "/base/personInfo/delete/" + id);
-}
-
-function batchRemove(idList) {
-  return request.post(constant.serverUrl + "/base/personInfo/batchDelete", idList, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-function check(id) {
-  return request.post(constant.serverUrl + "/base/personInfo/check/" + id);
-}
-
-
-export default {
-  pageList, create, edit, add, update, remove, batchRemove,check
-}

+ 0 - 60
src/api/base/recruitInformationInfo.js

@@ -1,60 +0,0 @@
-import request from '@/utils/request'
-import constant from '@/constant'
-
-function pageList(formData) {
-  return request.post(constant.serverUrl + "/base/recruitInformationInfo/pageList", formData);
-}
-
-function create() {
-  return request.get(constant.serverUrl + "/base/recruitInformationInfo/create");
-}
-
-function edit(id) {
-  return request.get(constant.serverUrl + "/base/recruitInformationInfo/edit/" + id);
-}
-
-function add(formModel) {
-  return request.post(constant.serverUrl + "/base/recruitInformationInfo/add", formModel, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-function update(formModel) {
-  return request.post(constant.serverUrl + "/base/recruitInformationInfo/update", formModel, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-function remove(id) {
-  return request.post(constant.serverUrl + "/base/recruitInformationInfo/delete/" + id);
-}
-
-
-function batchRemove(idList) {
-  return request.post(constant.serverUrl + "/base/recruitInformationInfo/batchDelete", idList, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-function check(id) {
-  return request.post(constant.serverUrl + "/base/recruitInformationInfo/check/" + id);
-}
-
-function changeIsOnline(id) {
-  return request.post(constant.serverUrl + "/base/recruitInformationInfo/changeIsOnline/" + id);
-}
-
-function changeTopping(id) {
-  return request.post(constant.serverUrl + "/base/recruitInformationInfo/changeTopping/" + id);
-}
-
-
-export default {
-  pageList, create, edit, add, update, remove, batchRemove,check,changeIsOnline,changeTopping
-}

+ 0 - 57
src/api/base/recruitPersonRelation.js

@@ -1,57 +0,0 @@
-import request from '@/utils/request'
-import constant from '@/constant'
-
-function pageList(formData) {
-  return request.post(constant.serverUrl + "/base/recruitPersonRelation/pageList", formData);
-}
-
-function create() {
-  return request.get(constant.serverUrl + "/base/recruitPersonRelation/create");
-}
-
-function edit(id) {
-  return request.get(constant.serverUrl + "/base/recruitPersonRelation/edit/" + id);
-}
-
-function add(formModel) {
-  return request.post(constant.serverUrl + "/base/recruitPersonRelation/add", formModel, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-function update(formModel) {
-  return request.post(constant.serverUrl + "/base/recruitPersonRelation/update", formModel, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-function remove(id) {
-  return request.post(constant.serverUrl + "/base/recruitPersonRelation/delete/" + id);
-}
-
-
-function batchRemove(idList) {
-  return request.post(constant.serverUrl + "/base/recruitPersonRelation/batchDelete", idList, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-function check(id) {
-  return request.post(constant.serverUrl + "/base/recruitPersonRelation/check/" + id);
-}
-
-
-function jobInformationDetail(id) {
-  return request.get(constant.serverUrl + "/base/recruitPersonRelation/jobInformationDetail/" + id);
-}
-
-
-export default {
-  pageList, create, edit, add, update, remove, batchRemove,check,jobInformationDetail
-}

+ 0 - 52
src/api/base/shareWorksInfo.js

@@ -1,52 +0,0 @@
-import request from '@/utils/request'
-import constant from '@/constant'
-
-function pageList(formData) {
-  return request.post(constant.serverUrl + "/base/shareWorksInfo/pageList", formData);
-}
-
-function create() {
-  return request.get(constant.serverUrl + "/base/shareWorksInfo/create");
-}
-
-function edit(id) {
-  return request.get(constant.serverUrl + "/base/shareWorksInfo/edit/" + id);
-}
-
-function add(formModel) {
-  return request.post(constant.serverUrl + "/base/shareWorksInfo/add", formModel, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-function update(formModel) {
-  return request.post(constant.serverUrl + "/base/shareWorksInfo/update", formModel, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-function remove(id) {
-  return request.post(constant.serverUrl + "/base/shareWorksInfo/delete/" + id);
-}
-
-
-function batchRemove(idList) {
-  return request.post(constant.serverUrl + "/base/shareWorksInfo/batchDelete", idList, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-function check(id) {
-    return request.post(constant.serverUrl + "/base/shareWorksInfo/check/" + id);
-  }
-
-
-export default {
-  pageList, create, edit, add, update, remove, batchRemove,check
-}

+ 0 - 52
src/api/base/trainingInfo.js

@@ -1,52 +0,0 @@
-import request from '@/utils/request'
-import constant from '@/constant'
-
-function pageList(formData) {
-  return request.post(constant.serverUrl + "/base/trainingInfo/pageList", formData);
-}
-
-function create() {
-  return request.get(constant.serverUrl + "/base/trainingInfo/create");
-}
-
-function edit(id) {
-  return request.get(constant.serverUrl + "/base/trainingInfo/edit/" + id);
-}
-
-function add(formModel) {
-  return request.post(constant.serverUrl + "/base/trainingInfo/add", formModel, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-function update(formModel) {
-  return request.post(constant.serverUrl + "/base/trainingInfo/update", formModel, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-function remove(id) {
-  return request.post(constant.serverUrl + "/base/trainingInfo/delete/" + id);
-}
-
-
-function batchRemove(idList) {
-  return request.post(constant.serverUrl + "/base/trainingInfo/batchDelete", idList, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-function check(id) {
-    return request.post(constant.serverUrl + "/base/trainingInfo/check/" + id);
-  }
-
-
-export default {
-  pageList, create, edit, add, update, remove, batchRemove,check
-}

+ 0 - 47
src/api/base/trainingPerson.js

@@ -1,47 +0,0 @@
-import request from '@/utils/request'
-import constant from '@/constant'
-
-function pageList(formData) {
-  return request.post(constant.serverUrl + "/base/trainingPerson/pageList", formData);
-}
-
-function create() {
-  return request.get(constant.serverUrl + "/base/trainingPerson/create");
-}
-
-function edit(id) {
-  return request.get(constant.serverUrl + "/base/trainingPerson/edit/" + id);
-}
-
-function add(formModel) {
-  return request.post(constant.serverUrl + "/base/trainingPerson/add", formModel, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-function update(formModel) {
-  return request.post(constant.serverUrl + "/base/trainingPerson/update", formModel, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-function remove(id) {
-  return request.post(constant.serverUrl + "/base/trainingPerson/delete/" + id);
-}
-
-
-function batchRemove(idList) {
-  return request.post(constant.serverUrl + "/base/trainingPerson/batchDelete", idList, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-export default {
-  pageList, create, edit, add, update, remove, batchRemove
-}

+ 0 - 47
src/api/statistical/generateReport.js

@@ -1,47 +0,0 @@
-import request from '@/utils/request'
-import constant from '@/constant'
-
-function pageList(formData) {
-  return request.post(constant.serverUrl + "/base/generateReport/pageList", formData);
-}
-
-function create() {
-  return request.get(constant.serverUrl + "/base/generateReport/create");
-}
-
-function edit(id) {
-  return request.get(constant.serverUrl + "/base/generateReport/edit/" + id);
-}
-
-function add(formModel) {
-  return request.post(constant.serverUrl + "/base/generateReport/add", formModel, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-function update(formModel) {
-  return request.post(constant.serverUrl + "/base/generateReport/update", formModel, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-function remove(id) {
-  return request.post(constant.serverUrl + "/base/generateReport/delete/" + id);
-}
-
-function batchRemove(idList) {
-  return request.post(constant.serverUrl + "/base/generateReport/batchDelete", idList, {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-}
-
-
-export default {
-  pageList, create, edit, add, update, remove, batchRemove
-}

+ 0 - 19
src/api/statistical/report.js

@@ -1,19 +0,0 @@
-import request from '@/utils/request'
-import constant from '@/constant'
-
-function dailyReport(formData) {
-  return request.post(constant.serverUrl + "/statistical/report/dailyReport", formData);
-}
-
-function dailyGroupReport(formData) {
-  return request.post(constant.serverUrl + "/statistical/report/dailyGroupReport", formData);
-}
-
-function dailyGroupReportTest() {
-  return request.post(constant.serverUrl + "/statistical/report/dailyGroupReportTest");
-}
-
-
-export default {
-    dailyReport,dailyGroupReport,dailyGroupReportTest
-}

+ 0 - 96
src/routers/modules/base.js

@@ -1,100 +1,4 @@
 var routers = [
-        {
-                path: '/base/personInfo/list',
-                name: 'basePersonInfoList',
-                // route level code-splitting
-                // this generates a separate chunk (about.[hash].js) for this route
-                // which is lazy-loaded when the route is visited.
-                component: () => import('@/views/base/personInfo-list.vue'),
-                meta: {
-                        roles: ["admin"],
-                        title: '人员管理'
-                }
-        },
-        {
-                path: '/base/enterpriseInfo/list',
-                name: 'baseEnterpriseInfoList',
-                // route level code-splitting
-                // this generates a separate chunk (about.[hash].js) for this route
-                // which is lazy-loaded when the route is visited.
-                component: () => import('@/views/base/enterpriseInfo-list.vue'),
-                meta: {
-                        roles: ["admin"],
-                        title: '企业管理'
-                }
-        },
-        {
-                path: '/base/newsInfo/list',
-                name: 'baseNewsInfoList',
-                // route level code-splitting
-                // this generates a separate chunk (about.[hash].js) for this route
-                // which is lazy-loaded when the route is visited.
-                component: () => import('@/views/base/newsInfo-list.vue'),
-                meta: {
-                        roles: ["admin"],
-                        title: '新闻管理'
-                }
-        },
-        {
-                path: '/base/jobInformationInfo/list',
-                name: 'baseJobInformationInfoList',
-                // route level code-splitting
-                // this generates a separate chunk (about.[hash].js) for this route
-                // which is lazy-loaded when the route is visited.
-                component: () => import('@/views/base/jobInformationInfo-list.vue'),
-                meta: {
-                        roles: ["admin"],
-                        title: '求职信息管理'
-                }
-        },
-        {
-                path: '/base/recruitInformationInfo/list',
-                name: 'baseRecruitInformationInfoList',
-                // route level code-splitting
-                // this generates a separate chunk (about.[hash].js) for this route
-                // which is lazy-loaded when the route is visited.
-                component: () => import('@/views/base/recruitInformationInfo-list.vue'),
-                meta: {
-                        roles: ["admin"],
-                        title: '招聘信息管理'
-                }
-        },
-        {
-                path: '/base/shareWorksInfo/list',
-                name: 'baseShareWorksInfoList',
-                // route level code-splitting
-                // this generates a separate chunk (about.[hash].js) for this route
-                // which is lazy-loaded when the route is visited.
-                component: () => import('@/views/base/shareWorksInfo-list.vue'),
-                meta: {
-                        roles: ["admin"],
-                        title: '共享用工信息'
-                }
-        },
-        {
-                path: '/base/trainingInfo/list',
-                name: 'baseTrainingInfoList',
-                // route level code-splitting
-                // this generates a separate chunk (about.[hash].js) for this route
-                // which is lazy-loaded when the route is visited.
-                component: () => import('@/views/base/trainingInfo-list.vue'),
-                meta: {
-                        roles: ["admin"],
-                        title: '技能培训信息'
-                }
-        },
-        {
-                path: '/base/mobileBannerInfo/list',
-                name: 'baseMobileBannerInfoList',
-                // route level code-splitting
-                // this generates a separate chunk (about.[hash].js) for this route
-                // which is lazy-loaded when the route is visited.
-                component: () => import('@/views/base/mobileBannerInfo-list.vue'),
-                meta: {
-                        roles: ["admin"],
-                        title: '移动端首页图'
-                }
-        },
 ]
 
 export default routers;

+ 0 - 36
src/routers/modules/statistical.js

@@ -1,40 +1,4 @@
 var routers = [
-    {
-            path: '/statistical/dailyReport/list',
-            name: 'statisticalDailyReportList',
-            // route level code-splitting
-            // this generates a separate chunk (about.[hash].js) for this route
-            // which is lazy-loaded when the route is visited.
-            component: () => import('@/views/statistical/dailyReport-list.vue'),
-            meta: {
-                    roles: ["admin"],
-                    title: '统计日报表'
-            }
-    },
-    {
-        path: '/statistical/dailyGroupReport/list',
-        name: 'statisticalDailyGroupReportList',
-        // route level code-splitting
-        // this generates a separate chunk (about.[hash].js) for this route
-        // which is lazy-loaded when the route is visited.
-        component: () => import('@/views/statistical/dailyGroupReport-list.vue'),
-        meta: {
-                roles: ["admin"],
-                title: '分组统计日报表'
-        }
-     },
-     {
-        path: '/statistical/generateReport/list',
-        name: 'statisticalGenerateReportList',
-        // route level code-splitting
-        // this generates a separate chunk (about.[hash].js) for this route
-        // which is lazy-loaded when the route is visited.
-        component: () => import('@/views/statistical/generateReport-list.vue'),
-        meta: {
-                roles: ["admin"],
-                title: '历史分组统计日报表'
-        }
-     },
 ]
 
 export default routers;

+ 0 - 240
src/views/base/enterpriseInfo-detail.vue

@@ -1,240 +0,0 @@
-
-<template>
-    <el-dialog
-      :visible.sync="showDialog"
-      :title="title"
-      :modal-append-to-body="false"
-      style="text-align: left;"
-      @close="closeDialog"
-      :close-on-click-modal="false"
-      width="600px"
-    >
-      <div class="user-panel" v-loading="loading">
-        <el-form
-          ref="form"
-          :model="formModel"
-          :rules="ruleValidate"
-          :label-width="'100px'"
-        >
-          <el-form-item label="企业名称" prop="name">
-            <el-input v-model="formModel.name" placeholder="请输入企业名称" style="width: 300px"></el-input>
-          </el-form-item>
-          <el-form-item label="企业地址" prop="address">
-            <el-input v-model="formModel.address" placeholder="请输入企业地址" style="width: 300px"></el-input>
-          </el-form-item>
-          <el-form-item label="企业联系人" prop="contactsPersonId">
-            <el-input v-model="formModel.contactsPersonId" placeholder="请输入企业联系人" style="width: 300px"></el-input>
-          </el-form-item>
-          <el-form-item label="联系电话" prop="contactsPhone">
-            <el-input v-model="formModel.contactsPhone" placeholder="请输入联系电话" style="width: 300px"></el-input>
-          </el-form-item>
-          <el-form-item label="营业执照" prop="licenseImage">
-              <el-upload
-                  style="width:300px"
-                  class="avatar-uploader"
-                  name="photoFile"
-                  :action="uploadUrl"
-                  :headers="headers"
-                  :data="uploadData"
-                  :show-file-list="false"
-                  :on-success="handleAvatarSuccess"
-                  :before-upload="beforeAvatarUpload">
-                  <img v-if="fileUrl" :src="fileUrl" class="avatar">
-                  <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-              </el-upload>
-          </el-form-item>
-  
-  
-        </el-form>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="closeDialog">取 消</el-button>
-        <el-button type="primary" @click="handleSubmit" :loading="submitting"
-          >确 定</el-button
-        >
-      </span>
-    </el-dialog>
-  </template>
-  <script>
-  import Constant from "@/constant";
-  import { getToken } from "@/utils/auth"; // get token from cookie
-  import enterpriseInfoApi from "@/api/base/enterpriseInfo";
-  
-  export default {
-    props: ["businessKey", "title"],
-    data() {
-      const validateIsReName=(rule,value,callBack)=>{
-
-        var formData = new FormData();
-
-        formData.append("id", this.businessKey);
-        formData.append("name", value);
-
-        enterpriseInfoApi.nameIsRepeatCheck(formData).then(function (response) {
-            self.loading = false;
-
-            var jsonData = response.data;
-
-            if(jsonData.result){
-              if(!jsonData.data){
-                callBack(new Error("检测到重复的企业名称,不能重复添加!"));
-              }
-              else{
-                callBack();
-              }
-            }
-        })
-      }
-      return {
-          showPwd: true,
-          ruleValidate: {
-              name: [
-                { required: true, message: "企业名称不能为空", trigger: "blur" },
-                { validator: validateIsReName, trigger: "blur" }
-              ],
-          },
-          roleList: [],
-          formModel: {},
-          showDialog: true,
-          loading: false,
-          submitting: false,
-          companyProps: {
-              value: "id",
-              label: "name",
-          },
-          //上传地址
-          uploadUrl: Constant.serverUrl + "/uploadPicture",
-          uploadData: {
-              subFolder: "temporary-workers",
-          },
-          fileUrl: "",
-          headers: {
-              Authorization: getToken(),
-          },
-      };
-    },
-    methods: {
-      closeDialog() {
-        this.$emit("close", false);
-      },
-      handleSubmit() {
-        var self = this;
-  
-        this.$refs["form"].validate((valid) => {
-          if (valid) {
-            (function () {
-              var id = self.formModel.id;
-  
-              if (id == null || id.length == 0) {
-                return enterpriseInfoApi.add(self.formModel);
-              } else {
-                return enterpriseInfoApi.update(self.formModel);
-              }
-            })().then(function (response) {
-              var jsonData = response.data;
-  
-              if (jsonData.result) {
-                self.$message({
-                  message: "保存成功!",
-                  type: "success",
-                });
-  
-                self.$emit("close", true);
-              } else {
-                self.$message({
-                  message: jsonData.message + "",
-                  type: "warning",
-                });
-  
-                self.$emit("close", false);
-              }
-            });
-          }
-        });
-      },
-      handleAvatarSuccess(res, file) {
-          var self = this;
-          self.formModel.licenseImage = res.data;
-  
-          self.fileUrl =
-            res.data + "?x-oss-process=image/resize,m_lfit,h_300,w_300";
-      },
-      beforeAvatarUpload(file) {
-          const isJPG = file.type === 'image/jpeg';
-          const isLt2M = file.size / 1024 / 1024 < 2;
-  
-          // if (!isJPG) {
-          //     this.$message.error('上传头像图片只能是 JPG 格式!');
-          // }
-          if (!isLt2M) {
-              this.$message.error('上传头像图片大小不能超过 2MB!');
-          }
-          return isLt2M;
-      }
-    },
-    async mounted() {
-      var self = this;
-      self.loading = true;
-  
-      (function () {
-        if (self.businessKey != null && self.businessKey.length > 0) {
-          return enterpriseInfoApi.edit(self.businessKey);
-        } else {
-          return enterpriseInfoApi.create();
-        }
-      })()
-        .then((response) => {
-          var jsonData = response.data;
-  
-          if (jsonData.result) {
-            self.formModel = jsonData.data;
-
-            let licenseImage = self.formModel.licenseImage;
-            if (licenseImage != null) {
-                self.fileUrl = licenseImage 
-            }
-
-            self.showModal = true;
-          } else {
-            self.$message.error(jsonData.message + "");
-          }
-  
-          self.loading = false;
-        })
-        .catch((error) => {
-          self.$message.error(error + "");
-          self.loading = false;
-        });
-    },
-    components: {
-    },
-  };
-  </script>
-  <style scoped>
-  .user-panel {
-    margin: 10px auto;
-  }
-  .avatar-uploader .el-upload {
-      border: 1px dashed #d9d9d9;
-      border-radius: 6px;
-      cursor: pointer;
-      position: relative;
-      overflow: hidden;
-    }
-    .avatar-uploader .el-upload:hover {
-      border-color: #409EFF;
-    }
-    .avatar-uploader-icon {
-      font-size: 28px;
-      color: #8c939d;
-      width: 178px;
-      height: 178px;
-      line-height: 178px;
-      text-align: center;
-    }
-    .avatar {
-      width: 178px;
-      height: 178px;
-      display: block;
-    }
-  </style>

+ 0 - 470
src/views/base/enterpriseInfo-list.vue

@@ -1,470 +0,0 @@
-<template>
-    <div>
-      <el-breadcrumb separator=">">
-        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-        <el-breadcrumb-item>
-          <a href="#">基础信息管理</a>
-        </el-breadcrumb-item>
-        <el-breadcrumb-item>
-          企业管理
-        </el-breadcrumb-item>
-      </el-breadcrumb>
-      <el-divider></el-divider>
-      <!--
-        要resetFields起作用,必须配置:model和prop
-      -->
-      <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
-        <el-form-item label="企业名称" prop="name">
-          <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button
-            type="primary"
-            size="mini"
-            icon="ios-search"
-            @click="changePage(1)"
-            :loading="loading"
-          >查询</el-button>&nbsp;
-          <el-button
-            type="info"
-            size="mini"
-            style="margin-left: 8px"
-            @click="handleReset('queryForm')"
-          >重置</el-button>&nbsp;
-        </el-form-item>
-      </el-form>
-      <el-divider></el-divider>
-      <el-row class="button-group">
-        <el-button type="primary" size="small" plain icon="el-icon-circle-plus" @click="handleAdd">新增</el-button>
-        <el-button
-          type="primary"
-          size="small"
-          plain
-          icon="el-icon-remove"
-          :disabled="multipleSelection.length==0"
-          @click="handleBatchDelete"
-        >删除选中项</el-button>
-        <el-button
-          type="primary"
-          size="small"
-          plain
-          icon="el-icon-upload"
-          @click="batchImportVisible = true"
-        >导入</el-button>
-        <el-button
-          type="primary"
-          size="small"
-          plain
-          icon="el-icon-upload2"
-          @click="exportXls"
-        >导出数据</el-button>
-      </el-row>
-      <el-table
-        :data="tableData"
-        style="min-height:400px;"
-        v-loading="loading"
-        stripe
-        @sort-change="sortChange"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column  prop="name"  label="企业名称"></el-table-column>
-        <el-table-column  prop="address"  label="企业地址"></el-table-column>
-        <el-table-column  prop="contactsPersonId"  label="企业联系人"></el-table-column>
-        <el-table-column  prop="contactsPhone"  label="联系电话"></el-table-column>
-        <el-table-column  prop="licenseImage"  label="营业执照图片">
-          <template slot-scope="{row}">
-            <a v-if="row.licenseImage" :href="row.licenseImage" target="_blank">
-              <el-image
-              style="width: 50px; height: 50px"
-              :src="row.licenseImage"
-              fit="fit"></el-image>
-            </a>
-          </template>
-        </el-table-column>
-        <el-table-column  prop="status"  label="认证状态">
-          <template slot-scope="{row}">
-            <span v-if="row.status=='0'" style="color: #F56C6C;">未认证</span>
-            <span v-else-if="row.status=='1'" style="color: #67C23A;">已认证</span>
-          </template>
-        </el-table-column>
-        <el-table-column  prop="checkTime"  label="认证时间" width="180"></el-table-column>
-        <el-table-column label="操作" width="250">
-          <template slot-scope="{row}">
-            <el-button size="mini" type="warning" @click="handleEdit(row)">编辑</el-button>
-            <el-button size="mini" v-if="row.status==0" type="success" @click="handleCheck(row)">认证</el-button>
-            <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-        :current-page.sync="pageIndex"
-        :total="totalElements"
-        :page-sizes="pageSizeList"
-        @current-change="changePage"
-        @size-change="pageSizeChange"
-        layout="total, sizes, prev, pager, next, jumper"
-      ></el-pagination>
-      <enterpriseInfo-detail
-        v-if="showModal"
-        ref="userDetail"
-        :businessKey="businessKey"
-        :title="modalTitle"
-        @close="onDetailModalClose"
-      ></enterpriseInfo-detail>
-      <el-dialog
-      title="批量导入企业"
-      :visible.sync="batchImportVisible"
-      :modal-append-to-body="false"
-      style="text-align: left"
-      :close-on-click-modal="false"
-    >
-      <el-form label-width="150px">
-        <el-form-item label="模板下载">
-          <el-link
-            href="https://oss.xiaoxinda.com/jk-temporary-workers/enterpriseInfo.xls"
-            type="primary"
-            target="_blank"
-            >点击下载模板</el-link
-          >
-        </el-form-item>
-        <el-form-item label="上传文件">
-          <el-upload
-            class="upload-demo"
-            accept=".xls"
-            :action="uploadUrlXls"
-            :data="uploadXlsData"
-            :headers="headers"
-            :on-preview="handleBatchImportPreview"
-            name="uploadFile"
-            :multiple="true"
-            :limit="1"
-            :on-remove="handleBatchImportRemove"
-            :before-remove="beforeBatchImportRemove"
-            :before-upload="beforeUpload"
-            :on-exceed="handleBatchImportExceed"
-            :on-success="handleBatchImportSuccess"
-            :file-list="batchImportFileList"
-          >
-            <el-button size="small" type="primary" :loading="xlsLoading"
-              >点击上传</el-button
-            >
-            <div slot="tip" class="el-upload__tip">
-              只能上传xls文件,且不超过500kb
-            </div>
-          </el-upload>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="batchImportVisible = false"
-          >关 闭</el-button
-        >
-      </div>
-    </el-dialog>
-    </div>
-  </template>
-  <script>
-  import Constant from "@/constant";
-  import enterpriseInfoApi from "@/api/base/enterpriseInfo";
-  import enterpriseInfoDetail from "./enterpriseInfo-detail";
-  import { getToken } from "@/utils/auth"; // get token from cookie
-  
-  export default {
-    name: 'baseEnterpriseInfoList',
-    data() {
-      var self = this;
-  
-      return {
-        queryModel: {
-          name: "",
-        },
-        loading: false,
-        tableData: [],
-        pageIndex: 1,
-        pageSize: 10,
-        totalPages: 0,
-        totalElements: 0,
-        field: "",
-        direction: "",
-        pageSizeList: [10, 20, 30],
-        multipleSelection: [],
-        modalTitle: "",      
-        businessKey: "",
-        showModal: false,
-        dialogFormVisible:false,
-        newPassword:"",
-        roleResult:[],
-        props: {
-          // 配置项(必选)
-          value: "id",
-          label: "name",
-          children: "children"
-        },
-        batchImportVisible: false,
-        xlsLoading: false,
-        batchImportFileList: [],
-        uploadUrlXls: Constant.serverUrl + "/base/enterpriseInfo/importXls",
-        uploadXlsData: {
-            subFolder: "enterpriseInfo",
-        },
-        headers: {
-            Authorization: getToken(),
-        },
-      };
-    },
-    methods: {
-      changePage(pageIndex,exportFlag) {
-        var self = this;
-  
-        console.log(pageIndex);
-  
-        self.pageIndex = pageIndex;
-        var formData = new FormData();
-  
-        formData.append("pageIndex", self.pageIndex);
-        if(exportFlag!=null){
-            formData.append("exportFlag", exportFlag);
-            formData.append("pageSize", 10000);
-        }
-        else{
-            formData.append("pageSize", self.pageSize);
-        }
-  
-        formData.append("name", self.queryModel.name);
-        
-  
-        self.loading = true;
-  
-        enterpriseInfoApi.pageList(formData).then(function(response) {
-          self.loading = false;
-            var jsonData = response.data;
-            if(jsonData.result) {
-                if(exportFlag){
-                    //导出
-                    self.$message({
-                        showClose: true,
-                        type: "success",
-                        message: `报表已生成,<a href="${jsonData.data}">请点击链接下载</a>`,
-                        dangerouslyUseHTMLString: true,
-                        duration: 30000
-                    });
-                }
-                else{
-                    //分页查看
-                    var page = jsonData.data;
-
-                    self.tableData = page.data;
-                    self.totalPages = page.totalPages;
-                    self.totalElements = page.recordsTotal;
-                }
-            }
-            else{
-                self.$message.warning(jsonData.message);
-            }
-        }).catch((error)=>{
-          self.loading = false;
-        });
-      },
-      pageSizeChange(pageSize) {
-        this.pageSize = pageSize;
-      },
-      sortChange(data) {
-        this.field = data.column.field;
-        this.direction = data.order == "ascending" ? "asc" : "desc";
-  
-        this.changePage(this.pageIndex);
-      },
-      handleSelectionChange(val) {
-        this.multipleSelection = val;
-      },
-      handleReset(name) {
-        this.$refs[name].resetFields();
-      },
-      handleAdd() {
-        var self = this;
-        
-        self.modalTitle = "新增企业";
-        self.businessKey = "";
-        self.showModal = true;
-      },
-      handleEdit(record) {
-        var self = this;
-        
-        self.modalTitle = "编辑企业";
-        self.businessKey = record.id;
-        self.showModal = true;
-      },
-      handleDelete(record) {
-        var self = this;
-  
-        this.$confirm("是否确认删除?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          enterpriseInfoApi.remove(record.id).then(function(response) {
-            var jsonData = response.data;
-  
-            if (jsonData.result) {
-              // var index = self.tableData.indexOf(record);
-              // self.tableData.splice(index, 1);
-              self.changePage(self.pageIndex);
-  
-              self.$message({
-                type: "success",
-                message: "删除成功!"
-              });
-            }
-          });
-        });
-      },
-      handleBatchDelete() {
-        var self = this;
-  
-        var idList = this.multipleSelection.map(record => {
-          return record.id;
-        });
-  
-        this.$confirm("是否确认删除选中项?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          enterpriseInfoApi.batchRemove(idList).then(function(response) {
-            var jsonData = response.data;
-  
-            if (jsonData.result) {
-              self.changePage(self.pageIndex);
-  
-              self.$message({
-                type: "success",
-                message: "删除成功!"
-              });
-            }
-          });
-        });
-      },
-      exportXls() {
-        this.changePage(1,true);
-      },
-      handleCheck(record){
-        var self = this;
-  
-        this.$confirm("是否确认认证?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          enterpriseInfoApi.check(record.id).then(function(response) {
-            var jsonData = response.data;
-
-            if (jsonData.result) {
-              // var index = self.tableData.indexOf(record);
-              // self.tableData.splice(index, 1);
-              self.changePage(self.pageIndex);
-
-              self.$message({
-                type: "success",
-                message: "认证成功!"
-              });
-            }
-          });
-        });
-      },
-      beforeUpload(file, fileList) {
-          //导入前判断
-          var self = this;
-          self.xlsLoading = true;
-          return true;
-      },
-              //批量导入-上传成功
-              handleBatchImportSuccess(response, file, fileList) {
-        var self = this;
-        self.xlsLoading = false;
-
-        if (response.result) {
-            self.$message.success(response.message);
-            this.batchImportFileList = [];
-            this.changePage(1);
-
-
-        } else {
-            //this.$message.error(response.message);
-            this.batchImportFileList = [];
-            this.changePage(1);
-
-            if (response.data != null) {
-            //下载有错误信息提示的报表
-            //window.open(response.data);
-            self.$message({
-                showClose: true,
-                dangerouslyUseHTMLString: true,
-                message:
-                response.message +
-                `,<a href="${response.data}" target="_blank">点击下载未导入的数据报表</a>&nbsp;`,
-                duration: 30000,
-            });
-            }
-        }
-
-        this.batchImportVisible = false;
-      },
-      //批量导入-预览
-      handleBatchImportPreview(file) {
-        console.log(file.url);
-      },
-      //批量导入-移除
-      handleBatchImportRemove(file, fileList) {
-        console.log(file, fileList);
-      },
-      //批量导入-移除前操作
-      beforeBatchImportRemove(file, fileList) {
-        console.log(file, fileList);
-      },
-      //批量导入-文件超出个数限制时的钩子
-      handleBatchImportExceed(files, fileList) {
-      this.$message.warning(
-          `当前限制选择 3 个文件,本次选择了 ${files.length} 个文件,共选择了 ${
-          files.length + fileList.length
-          } 个文件`
-        );
-      },
-      
-      onDetailModalClose(refreshed) {
-        this.showModal = false;
-  
-        if(refreshed) {
-          this.changePage(this.pageIndex);
-        }
-      },
-      
-    },
-    mounted: function() {
-      var self = this;
-      this.changePage(1);
-    },
-    components: {
-        "enterpriseInfo-detail":enterpriseInfoDetail
-    }
-  };
-  </script>
-  <style lang="scss" scoped>
-  .el-breadcrumb {
-    margin: 10px;
-    line-height: 20px;
-  }
-  
-  .el-divider {
-    margin: 5px 0;
-  }
-  
-  .demo-form-inline {
-    margin-left: 10px;
-    text-align: left;
-  }
-  
-  .button-group {
-    padding: 10px;
-    text-align: left;
-  }
-  </style>

+ 0 - 173
src/views/base/jobEnterpriseRelation-list.vue

@@ -1,173 +0,0 @@
-
-<template>
-    <el-dialog
-      :visible.sync="showDialog"
-      :title="title"
-      :modal-append-to-body="false"
-      style="text-align: left;"
-      @close="closeDialog"
-      :close-on-click-modal="false"
-      width="900px"
-    >
-      <div class="user-panel" v-loading="loading">
-        <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
-            <el-form-item label="企业名称" prop="name">
-                <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
-            </el-form-item>
-            <el-form-item>
-            <el-button
-                type="primary"
-                size="mini"
-                icon="ios-search"
-                @click="changePage(1)"
-                :loading="loading"
-            >查询</el-button>&nbsp;
-            <el-button
-                type="info"
-                size="mini"
-                style="margin-left: 8px"
-                @click="handleReset('queryForm')"
-            >重置</el-button>&nbsp;
-            </el-form-item>
-        </el-form>
-        <el-divider></el-divider>
-        <el-table
-        :data="tableData"
-        style="min-height:400px;"
-        v-loading="loading"
-        stripe
-        @sort-change="sortChange"
-        @selection-change="handleSelectionChange"
-      >
-            <!-- <el-table-column type="selection" width="55"></el-table-column> -->
-            <el-table-column  prop="enterpriseName"  label="企业名称"></el-table-column>
-            <el-table-column  prop="phone"  label="联系电话"></el-table-column>
-            <el-table-column  prop="enterpriseAddress"  label="企业地址"></el-table-column>
-            <el-table-column  prop="recruitPositionName"  label="招聘岗位"></el-table-column>
-            <el-table-column  prop="createTime"  label="邀请时间" width="180"></el-table-column>
-            
-            <!-- <el-table-column label="查看">
-              <template slot-scope="{row}">
-                  <el-link type="primary" @click="handleDetail(row)">招聘信息</el-link>
-              </template>
-            </el-table-column> -->
-        </el-table>
-        <el-pagination
-            style="text-align: center;"
-            :current-page.sync="pageIndex"
-            :total="totalElements"
-            :page-sizes="pageSizeList"
-            @current-change="changePage"
-            @size-change="pageSizeChange"
-            layout="total, sizes, prev, pager, next, jumper"
-        ></el-pagination>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="closeDialog">取 消</el-button>
-      </span>
-    </el-dialog>
-  </template>
-  <script>
-  import jobEnterpriseRelationApi from "@/api/base/jobEnterpriseRelation";
-  
-  export default {
-    props: ["businessKey", "title"],
-    data() {
-      return {
-            submitting: false,
-            queryModel: {
-                name:"",
-                phone:"",
-            },
-            showDialog: true,
-            loading: false,
-            tableData: [],
-            pageIndex: 1,
-            pageSize: 10,
-            totalPages: 0,
-            totalElements: 0,
-            field: "",
-            direction: "",
-            pageSizeList: [10, 20, 30],
-            multipleSelection: [],
-            isStatus:false,
-      };
-    },
-    created() {
-
-    },
-    methods: {
-      closeDialog() {
-        this.$emit("close", false,this.isStatus);
-      },
-      changePage(pageIndex) {
-        var self = this;
-  
-        console.log(pageIndex);
-  
-        self.pageIndex = pageIndex;
-        var formData = new FormData();
-  
-        formData.append("pageIndex", self.pageIndex);
-        formData.append("pageSize", self.pageSize);
-  
-        formData.append("informationId", self.businessKey);
-        formData.append("name", self.queryModel.name);
-        formData.append("phone", self.queryModel.phone);
-  
-        self.loading = true;
-  
-        jobEnterpriseRelationApi.pageList(formData).then(function(response) {
-          self.loading = false;
-  
-          var jsonData = response.data;
-  
-          if(jsonData.result){
-            var pageInfo = jsonData.data;
-  
-            self.tableData = pageInfo.data;
-            self.totalPages = pageInfo.totalPages;
-            self.totalElements = pageInfo.recordsTotal;
-            if(pageInfo.updateCount>0){
-              self.isStatus = true
-            }
-          }
-          else {
-            self.$message({
-                message: jsonData.message + "",
-                type: "warning"
-              });
-          }
-        }).catch((error)=>{
-          self.loading = false;
-        });
-      },
-      handleReset(name) {
-        this.$refs[name].resetFields();
-      },
-      pageSizeChange(pageSize) {
-        this.pageSize = pageSize;
-      },
-      sortChange(data) {
-        this.field = data.column.field;
-        this.direction = data.order == "ascending" ? "asc" : "desc";
-  
-        this.changePage(this.pageIndex);
-      },
-      handleSelectionChange(val) {
-        this.multipleSelection = val;
-      },
-    },
-    async mounted() {
-      var self = this;
-      self.changePage(1);
-    },
-    components: {
-    },
-  };
-  </script>
-  <style scoped>
-  .user-panel {
-    margin: 10px auto;
-  }
-  </style>

+ 0 - 485
src/views/base/jobInformationInfo-list.vue

@@ -1,485 +0,0 @@
-<template>
-    <div>
-      <el-breadcrumb separator=">">
-        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-        <el-breadcrumb-item>
-          <a href="#">基础信息管理</a>
-        </el-breadcrumb-item>
-        <el-breadcrumb-item>
-          求职信息管理
-        </el-breadcrumb-item>
-      </el-breadcrumb>
-      <el-divider></el-divider>
-      <!--
-        要resetFields起作用,必须配置:model和prop
-      -->
-      <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
-        <el-form-item label="求职人员" prop="name">
-          <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
-        </el-form-item>
-        <el-form-item label="意向行业" prop="intendedIndustries">
-          <el-select v-model="queryModel.intendedIndustries" size="mini" filterable placeholder="请选择" clearable>
-            <el-option
-                  v-for="result in intendedIndustriesList"
-                  :key="result.id"
-                  :label="result.name"
-                  :value="result.value"
-                ></el-option>
-            </el-select>
-        </el-form-item>
-        <el-form-item label="意向岗位" prop="intendedPosition">
-          <el-input type="text" size="mini" v-model="queryModel.intendedPosition"></el-input>
-        </el-form-item>
-        <el-form-item label="结算方式" prop="method">
-          <el-select v-model="queryModel.method" size="mini" filterable placeholder="请选择" clearable>
-            <el-option
-                  v-for="result in methodList"
-                  :key="result.id"
-                  :label="result.name"
-                  :value="result.value"
-                ></el-option>
-            </el-select>
-        </el-form-item>
-        <!-- <el-form-item label="工作经验" prop="workExperience">
-          <el-select v-model="queryModel.workExperience" size="mini" filterable placeholder="请选择" clearable>
-            <el-option
-                  v-for="result in workExperienceList"
-                  :key="result.id"
-                  :label="result.name"
-                  :value="result.value"
-                ></el-option>
-            </el-select>
-        </el-form-item> -->
-        <el-form-item label="最高学历" prop="education">
-          <el-select v-model="queryModel.education" size="mini" filterable placeholder="请选择" clearable>
-            <el-option
-                  v-for="result in educationList"
-                  :key="result.id"
-                  :label="result.name"
-                  :value="result.value"
-                ></el-option>
-            </el-select>
-        </el-form-item>
-        <el-form-item label="审核状态" prop="status">
-          <el-select v-model="queryModel.status" size="mini" filterable placeholder="请选择" clearable>
-            <el-option
-                  v-for="result in statusList"
-                  :key="result.id"
-                  :label="result.name"
-                  :value="result.value"
-                ></el-option>
-            </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button
-            type="primary"
-            size="mini"
-            icon="ios-search"
-            @click="changePage(1)"
-            :loading="loading"
-          >查询</el-button>&nbsp;
-          <el-button
-            type="info"
-            size="mini"
-            style="margin-left: 8px"
-            @click="handleReset('queryForm')"
-          >重置</el-button>&nbsp;
-        </el-form-item>
-      </el-form>
-      <el-divider></el-divider>
-      <el-row class="button-group">
-        <!-- <el-button type="primary" size="small" plain icon="el-icon-circle-plus" @click="handleAdd">新增</el-button> -->
-        <el-button
-          type="primary"
-          size="small"
-          plain
-          icon="el-icon-remove"
-          :disabled="multipleSelection.length==0"
-          @click="handleBatchDelete"
-        >删除选中项</el-button>
-        <el-button
-          type="primary"
-          size="small"
-          plain
-          icon="el-icon-upload2"
-          @click="exportXls"
-        >导出数据</el-button>
-      </el-row>
-      <el-table
-        :data="tableData"
-        style="min-height:400px;"
-        v-loading="loading"
-        stripe
-        @sort-change="sortChange"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column  prop="personName"  label="求职人员">
-            <template slot-scope="{row}">
-                <span>{{row.personName}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column  prop="serviceDesc"  label="服务描述" width="200"></el-table-column>
-        <el-table-column  prop="intendedIndustriesN"  label="意向行业"></el-table-column>
-        <el-table-column  prop="intendedPosition"  label="意向岗位"></el-table-column>
-        <el-table-column  prop="hopeSalary"  label="期望薪资"></el-table-column>
-        <el-table-column  prop="methodN"  label="结算方式"></el-table-column>
-        <el-table-column  prop="address"  label="居住地"></el-table-column>
-        <el-table-column  prop="educationN"  label="最高学历"></el-table-column>
-        <el-table-column  prop="status"  label="审核状态">
-          <template slot-scope="{row}">
-            <span v-if="row.status=='0'" style="color: #F56C6C;">未审核</span>
-            <span v-else-if="row.status=='1'" style="color: #67C23A;">已审核</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" width="280">
-          <template slot-scope="{row}">
-            <el-button class="btu1" v-if="row.status=='0'" size="mini" type="primary" @click="handleCheck(row)">审核</el-button>
-            <el-button class="btu1" size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
-            <el-badge v-if="row.isReadNumber!=0" :value="row.isReadNumber" class="item">
-              <el-button size="mini" type="success" @click="handleRelation(row)">收到邀请</el-button>
-            </el-badge>
-            <el-button v-else size="mini" type="success" @click="handleRelation(row)">收到邀请</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-        :current-page.sync="pageIndex"
-        :total="totalElements"
-        :page-sizes="pageSizeList"
-        @current-change="changePage"
-        @size-change="pageSizeChange"
-        layout="total, sizes, prev, pager, next, jumper"
-      ></el-pagination>
-      <enterpriseInfo-detail
-        v-if="showModal"
-        ref="userDetail"
-        :businessKey="businessKey"
-        :title="modalTitle"
-        @close="onDetailModalClose"
-      ></enterpriseInfo-detail>
-      <jobEnterpriseRelation-list
-        v-if="showModal2"
-        :businessKey="businessKey"
-        :title="modalTitle2"
-        @close="onDetailModalClose2"
-      ></jobEnterpriseRelation-list>
-    </div>
-  </template>
-  <script>
-  import jobInformationInfoApi from "@/api/base/jobInformationInfo";
-  import enterpriseInfoDetail from "./enterpriseInfo-detail";
-  import jobEnterpriseRelationList from "./jobEnterpriseRelation-list";
-  import dataDictionaryApi from "@/api/sys/dataDictionary";
-  
-  export default {
-    name: 'baseJobInformationInfoList',
-    data() {
-      var self = this;
-  
-      return {
-        queryModel: {
-          name: "",
-          intendedIndustries:"",
-          intendedPosition:"",
-          method:"",
-          workExperience:"",
-          education:"",
-          status:"",
-        },
-        loading: false,
-        tableData: [],
-        pageIndex: 1,
-        pageSize: 10,
-        totalPages: 0,
-        totalElements: 0,
-        field: "",
-        direction: "",
-        pageSizeList: [10, 20, 30],
-        multipleSelection: [],
-        modalTitle: "",
-        modalTitle2: "",       
-        businessKey: "",
-        showModal: false,
-        showModal2: false,
-        dialogFormVisible:false,
-        newPassword:"",
-        roleResult:[],
-        intendedIndustriesList:[],
-        methodList:[],
-        workExperienceList:[],
-        educationList:[],
-        statusList:[
-          {
-            "id":"0",
-            "name":"未审核",
-            "value":"0"
-          },
-          {
-            "id":"1",
-            "name":"已审核",
-            "value":"1"
-          }
-        ],
-        props: {
-          // 配置项(必选)
-          value: "id",
-          label: "name",
-          children: "children"
-        },
-      };
-    },
-    created() {
-        dataDictionaryApi.findByCatalogName({catalogName: "意向行业",})
-        .then((response) => {
-            var jsonData = response.data;
-            this.intendedIndustriesList = jsonData.data;
-        });
-
-        dataDictionaryApi.findByCatalogName({catalogName: "结算方式",})
-        .then((response) => {
-            var jsonData = response.data;
-            this.methodList = jsonData.data;
-        });
-
-        dataDictionaryApi.findByCatalogName({catalogName: "工作经验",})
-        .then((response) => {
-            var jsonData = response.data;
-            this.workExperienceList = jsonData.data;
-        });
-
-        dataDictionaryApi.findByCatalogName({catalogName: "学历",})
-        .then((response) => {
-            var jsonData = response.data;
-            this.educationList = jsonData.data;
-        });
-    },
-    methods: {
-      changePage(pageIndex,exportFlag) {
-        var self = this;
-  
-        console.log(pageIndex);
-  
-        self.pageIndex = pageIndex;
-        var formData = new FormData();
-  
-        formData.append("pageIndex", self.pageIndex);
-        if(exportFlag!=null){
-            formData.append("exportFlag", exportFlag);
-            formData.append("pageSize", 10000);
-        }
-        else{
-            formData.append("pageSize", self.pageSize);
-        }
-  
-        formData.append("name", self.queryModel.name);
-        formData.append("intendedIndustries", self.queryModel.intendedIndustries);
-        formData.append("intendedPosition", self.queryModel.intendedPosition);
-        formData.append("method", self.queryModel.method);
-        formData.append("workExperience", self.queryModel.workExperience);
-        formData.append("education", self.queryModel.education);
-        formData.append("status", self.queryModel.status);
-        
-  
-        self.loading = true;
-  
-        jobInformationInfoApi.pageList(formData).then(function(response) {
-          self.loading = false;
-  
-          var jsonData = response.data;
-  
-          if(jsonData.result){
-            if(exportFlag){
-                    //导出
-                    self.$message({
-                        showClose: true,
-                        type: "success",
-                        message: `报表已生成,<a href="${jsonData.data}">请点击链接下载</a>`,
-                        dangerouslyUseHTMLString: true,
-                        duration: 30000
-                    });
-                }
-                else{
-                    //分页查看
-                    var page = jsonData.data;
-
-                    self.tableData = page.data;
-                    self.totalPages = page.totalPages;
-                    self.totalElements = page.recordsTotal;
-                }
-          }
-          else {
-            self.$message({
-                message: jsonData.message + "",
-                type: "warning"
-              });
-          }
-        }).catch((error)=>{
-          self.loading = false;
-        });
-      },
-      pageSizeChange(pageSize) {
-        this.pageSize = pageSize;
-      },
-      sortChange(data) {
-        this.field = data.column.field;
-        this.direction = data.order == "ascending" ? "asc" : "desc";
-  
-        this.changePage(this.pageIndex);
-      },
-      handleSelectionChange(val) {
-        this.multipleSelection = val;
-      },
-      handleReset(name) {
-        this.$refs[name].resetFields();
-      },
-      exportXls() {
-        this.changePage(1,true);
-      },
-      handleAdd() {
-        var self = this;
-        
-        self.modalTitle = "新增企业";
-        self.businessKey = "";
-        self.showModal = true;
-      },
-      handleEdit(record) {
-        var self = this;
-        
-        self.modalTitle = "编辑企业";
-        self.businessKey = record.id;
-        self.showModal = true;
-      },
-      handleRelation(record) {
-        var self = this;
-        self.modalTitle2 = "收到邀请列表";
-        self.businessKey = record.id;
-        self.showModal2 = true;
-      },
-      handleCheck(record){
-        var self = this;
-  
-        this.$confirm("是否确认审核?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-            jobInformationInfoApi.check(record.id).then(function(response) {
-            var jsonData = response.data;
-
-            if (jsonData.result) {
-              // var index = self.tableData.indexOf(record);
-              // self.tableData.splice(index, 1);
-              self.changePage(self.pageIndex);
-
-              self.$message({
-                type: "success",
-                message: "审核成功!"
-              });
-            }
-          });
-        });
-      },
-      handleDelete(record) {
-        var self = this;
-  
-        this.$confirm("是否确认删除?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-            jobInformationInfoApi.remove(record.id).then(function(response) {
-            var jsonData = response.data;
-  
-            if (jsonData.result) {
-              // var index = self.tableData.indexOf(record);
-              // self.tableData.splice(index, 1);
-              self.changePage(self.pageIndex);
-  
-              self.$message({
-                type: "success",
-                message: "删除成功!"
-              });
-            }
-          });
-        });
-      },
-      handleBatchDelete() {
-        var self = this;
-  
-        var idList = this.multipleSelection.map(record => {
-          return record.id;
-        });
-  
-        this.$confirm("是否确认删除选中项?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-            jobInformationInfoApi.batchRemove(idList).then(function(response) {
-            var jsonData = response.data;
-  
-            if (jsonData.result) {
-              self.changePage(self.pageIndex);
-  
-              self.$message({
-                type: "success",
-                message: "删除成功!"
-              });
-            }
-          });
-        });
-      },
-      onDetailModalClose(refreshed) {
-        this.showModal = false;
-  
-        if(refreshed) {
-          this.changePage(this.pageIndex);
-        }
-      },
-      onDetailModalClose2(refreshed,status) {
-        this.showModal2 = false;
-  
-        if(refreshed||status) {
-          this.changePage(this.pageIndex);
-        }
-      },
-    },
-    mounted: function() {
-      var self = this;
-      this.changePage(1);
-    },
-    components: {
-        "enterpriseInfo-detail":enterpriseInfoDetail,
-        "jobEnterpriseRelation-list":jobEnterpriseRelationList
-    }
-  };
-  </script>
-  <style lang="scss" scoped>
-  .el-breadcrumb {
-    margin: 10px;
-    line-height: 20px;
-  }
-  
-  .el-divider {
-    margin: 5px 0;
-  }
-  
-  .demo-form-inline {
-    margin-left: 10px;
-    text-align: left;
-  }
-  
-  .button-group {
-    padding: 10px;
-    text-align: left;
-  }
-
-  .item{
-    margin-left: 10px;
-  }
-.btu1{
-  margin-top: 10px;
-  margin-right: 15px;
-}
-  </style>

+ 0 - 264
src/views/base/mobileBannerInfo-detail.vue

@@ -1,264 +0,0 @@
-
-<template>
-    <el-dialog
-      :visible.sync="showDialog"
-      :title="title"
-      :modal-append-to-body="true"
-      append-to-body
-      style="text-align:left;"
-      width="600px"
-      :close-on-click-modal="false"
-      @close="closeDialog"
-    >
-      <div class="user-panel" v-loading="loading">
-        <el-form ref="form" :model="formModel" inline :rules="ruleValidate" :label-width="'130px'">
-          <el-form-item label="幻灯片标题" prop="name">
-            <el-input v-model="formModel.name" placeholder="请输入幻灯片标题" style="width:300px"></el-input>
-          </el-form-item>
-          <el-form-item label="首页图类型" prop="classify">
-            <el-select v-model="formModel.classify" filterable placeholder="请选择" clearable style="width:300px;">
-              <el-option
-                    v-for="result in classifyList"
-                    :key="result.value"
-                    :label="result.name"
-                    :value="result.value"
-                  ></el-option>
-              </el-select>
-          </el-form-item>
-          <el-form-item label="幻灯片链接地址" prop="linkUrl">
-            <el-input v-model="formModel.linkUrl" placeholder="请输入幻灯片链接地址" style="width:300px"></el-input>
-          </el-form-item>
-          <el-form-item label="排序号" prop="sortNo">
-            <el-input-number v-model="formModel.sortNo" placeholder="请输入排序号" style="width:300px"></el-input-number>
-          </el-form-item>
-          <el-form-item label="幻灯片图片" prop="picUrl">
-              <el-upload
-                  class="avatar-uploader"
-                  name="photoFile"
-                  :action="uploadUrl"
-                  :show-file-list="false"
-                  :headers="headers"
-                  :data="uploadData"
-                  :on-success="handleAvatarSuccess"
-                  :before-upload="beforeAvatarUpload"
-                >
-                  <img v-if="fileUrl" :src="fileUrl" class="avatar" />
-                  <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-                </el-upload>
-          </el-form-item>
-        </el-form>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="closeDialog">取 消</el-button>
-        <el-button type="primary" @click="handleSubmit" :loading="submitting">确 定</el-button>
-      </span>
-    </el-dialog>
-  </template>
-  <script>
-  import Constant from "@/constant";
-  import mobileBannerInfoApi from "@/api/base/mobileBannerInfo";
-  import dataDictionaryApi from "@/api/sys/dataDictionary";
-  import { getToken } from "@/utils/auth"; // get token from cookie
-  
-  export default {
-    props: ["businessKey", "title"],
-    computed: {
-        ruleValidate (){
-          var rules = null;
-          rules = {
-              name: [
-                  { required: true, message: "幻灯片标题不能为空", trigger: "blur" }
-              ],
-          };
-          return rules;
-        }
-    },
-    data() {
-      return {
-        showDialog: true,
-        loading: false,
-        submitting: false,
-        formModel: {
-          id:"",
-          name:"",
-          parentId:"",
-          classifyArr:"",
-          rangeTime:"",
-          linkPicUrl:"",
-        },
-        templateList: [],
-        defaultPriceList:[],
-        chargingStationResult:[],
-        newsTypeList:[],
-        treeData: [],
-        props: {
-          // 配置项(必选)
-          value: "id",
-          label: "name",
-          children: "children"
-        },
-        //上传地址
-        uploadUrl: Constant.serverUrl + "/uploadPicture",
-        uploadData: {
-          subFolder: "mobileBannerInfo",
-        },
-        fileUrl: "",
-        headers: {
-          Authorization: getToken(),
-        },
-        classifyList:[],
-      };
-    },
-    methods: {
-      closeDialog() {
-        this.$emit("close", false);
-      },
-      handleAvatarSuccess(res, file) {
-        var self = this;
-        self.formModel.picUrl = res.data;
-        self.fileUrl =
-          res.data + "?x-oss-process=image/resize,m_lfit,h_300,w_300";
-      },
-      handleAvatarSuccess2(res, file) {
-        var self = this;
-        self.formModel.linkPicUrl = res.data;
-        self.fileUrl2 =
-          res.data + "?x-oss-process=image/resize,m_lfit,h_300,w_300";
-      },
-      beforeAvatarUpload(file) {
-        const isLt2M = file.size / 1024 / 1024 < 2;
-  
-        if (!isLt2M) {
-          this.$message.error("上传头像图片大小不能超过 2MB!");
-        }
-        return isLt2M;
-      },
-      handleSubmit() {
-        var self = this;
-  
-        this.$refs["form"].validate((valid) => {
-          if (valid) {
-            (function () {
-              var id = self.formModel.id;
-  
-              if (id == null || id.length == 0) {
-                return mobileBannerInfoApi.add(self.formModel);
-              } else {
-                return mobileBannerInfoApi.update(self.formModel);
-              }
-            })().then(function (response) {
-              var jsonData = response.data;
-  
-              if (jsonData.result) {
-                self.$message({
-                  message: "保存成功!",
-                  type: "success",
-                });
-  
-                self.$emit("close", true);
-              } else {
-                self.$message({
-                  message: jsonData.message + "",
-                  type: "warning",
-                });
-  
-                //self.$emit("close", false);
-              }
-            });
-          }
-        });
-      },
-    },
-    created() {
-      var self = this;
-  
-      var formData = new FormData();
-      formData.append("catalogName", "幻灯片分类");
-      dataDictionaryApi.findByCatalogName(formData).then((response) => {
-        var jsonData = response.data;
-        self.newsTypeList = jsonData.data;
-      });
-
-      dataDictionaryApi.findByCatalogName({catalogName: "首页图类型",})
-        .then((response) => {
-          var jsonData = response.data;
-          this.classifyList = jsonData.data;
-      });
-  
-  
-      //self.loadTree();
-    },
-    mounted: function () {
-      var self = this;
-  
-      (function () {
-        if (self.businessKey.length == 0) {
-          return mobileBannerInfoApi.create();
-        } else {
-          return mobileBannerInfoApi.edit(self.businessKey);
-        }
-      })()
-        .then((response) => {
-          var jsonData = response.data;
-          self.loading = false;
-  
-          if (jsonData.result) {
-            self.formModel = jsonData.data;
-            let picUrl = self.formModel.picUrl;
-            if (picUrl != null) {
-              self.fileUrl = picUrl 
-            }
-  
-            let linkPicUrl = self.formModel.linkPicUrl;
-            if (linkPicUrl != null) {
-              self.fileUrl2 = linkPicUrl 
-            }
-          } else {
-            self.$message.error(jsonData.message + "");
-          }
-        })
-        .catch((error) => {
-          self.$message.error(error + "");
-        });
-    },
-  };
-  </script>
-  
-  <style rel="stylesheet/scss" lang="scss" scoped>
-  .user-panel {
-    margin: 10px auto;
-  }
-  .input-form-main{
-      width: 300px;
-  }
-  .link-span{
-      margin-right: 20px;
-  }
-  .el-form-item{
-      margin-bottom: 25px;
-  }
-  
-   .avatar-uploader .el-upload {
-      border: 1px dashed #d9d9d9;
-      border-radius: 6px;
-      cursor: pointer;
-      position: relative;
-      overflow: hidden;
-    }
-    .avatar-uploader .el-upload:hover {
-      border-color: #409EFF;
-    }
-    .avatar-uploader-icon {
-      font-size: 28px;
-      color: #8c939d;
-      width: 178px;
-      height: 178px;
-      line-height: 178px;
-      text-align: center;
-    }
-    .avatar {
-      width: 178px;
-      height: 178px;
-      display: block;
-    }
-  </style>

+ 0 - 406
src/views/base/mobileBannerInfo-list.vue

@@ -1,406 +0,0 @@
-<template>
-    <div style="padding-left: 5px">
-        <el-breadcrumb separator=">">
-        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-        <el-breadcrumb-item>
-          <a href="#">基础信息管理</a>
-        </el-breadcrumb-item>
-        <el-breadcrumb-item>
-          移动端首页图
-        </el-breadcrumb-item>
-      </el-breadcrumb>
-      <el-divider></el-divider>
-      <el-form
-        ref="queryForm"
-        :model="queryModel"
-        inline
-        class="demo-form-inline"
-      >
-        <el-form-item label="幻灯片标题" prop="name">
-          <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button
-            type="primary"
-            size="mini"
-            icon="ios-search"
-            @click="changePage(1)"
-            :loading="loading"
-            >查询</el-button
-          >&nbsp;
-          <el-button
-            type="info"
-            size="mini"
-            style="margin-left: 8px"
-            @click="handleReset('queryForm')"
-            >重置</el-button
-          >&nbsp;
-        </el-form-item>
-      </el-form>
-      <el-divider></el-divider>
-      <el-row class="button-group">
-        <el-button
-          type="primary"
-          size="small"
-          plain
-          icon="el-icon-circle-plus"
-          @click="handleAdd"
-          >新增</el-button
-        >
-        <el-button
-          type="primary"
-          size="small"
-          plain
-          icon="el-icon-remove"
-          :disabled="multipleSelection.length == 0"
-          @click="handleBatchDelete"
-          >删除选中项</el-button
-        >
-      </el-row>
-      <el-table
-        ref="formTable"
-        :data="tableData"
-        v-loading="loading"
-        stripe
-        :height="tableHeight"
-        @sort-change="sortChange"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column
-          prop="name"
-          label="幻灯片标题"
-          width="200"
-        ></el-table-column>
-        <el-table-column
-          prop="classify"
-          label="分类"
-        ></el-table-column>
-        <el-table-column
-          prop="sortNo"
-          label="排序号"
-        ></el-table-column>
-        <el-table-column    prop="picUrl"   label="幻灯片图片"  width="150">
-            <template slot-scope="{ row }">
-              <a v-if="row.picUrl" :href="row.picUrl" target="_blank">
-                <el-image
-                  style="width: 50px; height: 50px"
-                  :src="row.picUrl"
-                  fit="fit"></el-image>
-              </a>
-            </template>
-        </el-table-column>
-        <el-table-column prop="enabled" label="审核状态">
-            <template slot-scope="{ row }">
-                <span v-if="row.enabled" style="color:green">已审核</span>
-                <span v-else style="color:red">未审核</span>
-            </template>
-        </el-table-column>
-        <el-table-column
-          prop="createTime"
-          label="创建时间"
-           width="150"
-        ></el-table-column>
-        <el-table-column label="操作">
-          <template slot-scope="{ row }">
-            <el-row>
-              <el-col>
-                <el-link
-                  type="primary"
-                  :underline="false"
-                  @click="handleEdit(row)"
-                  >编辑</el-link
-                >-
-                <el-link
-                    type="success"
-                    :underline="false"
-                    @click="handleCheck(row,true)"
-                    >审核通过</el-link
-                >-
-                <el-link
-                    type="danger"
-                    :underline="false"
-                    @click="handleCheck(row,false)"
-                    >审核不通过</el-link
-                >-
-                <el-link
-                  type="danger"
-                  :underline="false"
-                  @click="handleDelete(row)"
-                  >删除</el-link>
-              </el-col>
-            </el-row>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-        :current-page.sync="pageIndex"
-        :total="totalElements"
-        :page-sizes="pageSizeList"
-        @current-change="changePage"
-        @size-change="pageSizeChange"
-        layout="total, sizes, prev, pager, next, jumper"
-      ></el-pagination>
-      <mobileBannerInfo-detail
-        v-if="showModal"
-        :businessKey="businessKey"
-        :title="modalTitle"
-        @close="onDetailModalClose"
-      ></mobileBannerInfo-detail>
-    </div>
-  </template>
-  <script>
-  
-  import mobileBannerInfoDetail from "./mobileBannerInfo-detail";
-  import mobileBannerInfoApi from "@/api/base/mobileBannerInfo";
-  
-  export default {
-    name: "chargingMobileBannerInfoList",
-    data() {
-      var self = this;
-      return {
-        queryModel: {
-          name: "",
-        },
-        formModel:{
-          id:"",
-          enabled:"",
-        },
-        loading: false,
-        tableData: [],
-        treeData: [],
-        pageIndex: 1,
-        pageSize: 10,
-        totalPages: 0,
-        totalElements: 0,
-        field: "",
-        direction: "",
-        pageSizeList: [10, 20, 30],
-        multipleSelection: [],
-        showModal: false,
-        modalTitle: "",
-        businessKey: "",
-        tableHeight: 300,
-        showDeviceModal: false,
-        companyId: "",
-        qrCode: "",
-        companyResult: [],
-        props: {
-          // 配置项(必选)
-          value: "id",
-          label: "name",
-          children: "children",
-        },
-        batchImportVisible: false,
-        batchImportFileList: [],
-        xlsLoading: false,
-        sceneData: [],
-        typeData: [],
-        deviceRelationTitle: "",
-        showIconModal: false,
-        iconModalTitle: "",
-      };
-    },
-    created() {
-  
-      this.changePage(1);
-    },
-    methods: {
-      changePage(pageIndex) {
-        var self = this;
-  
-        self.loading = true;
-  
-        self.pageIndex = pageIndex;
-        var formData = new FormData();
-  
-        formData.append("pageIndex", self.pageIndex);
-        formData.append("pageSize", self.pageSize);
-  
-        formData.append("name", self.queryModel.name);
-  
-        mobileBannerInfoApi
-          .pageList(formData)
-          .then(function (response) {
-            self.loading = false;
-  
-            var jsonData = response.data.data;
-  
-            self.tableData = jsonData.data;
-            self.totalPages = jsonData.totalPages;
-            self.totalElements = jsonData.recordsTotal;
-            //45为分页栏的高度
-            //页面高度-列表上面的高度-分页栏高度
-            self.tableHeight =
-              window.innerHeight - self.$refs.formTable.$el.offsetTop - 100;
-          })
-          .catch((error) => {
-            self.loading = false;
-            // self.$message.error(error + "");
-          });
-      },
-      pageSizeChange(pageSize) {
-        this.pageSize = pageSize;
-      },
-      sortChange(data) {
-        this.field = data.column.field;
-        this.direction = data.order == "ascending" ? "asc" : "desc";
-  
-        this.changePage(this.pageIndex);
-      },
-      handleSelectionChange(val) {
-        this.multipleSelection = val;
-      },
-      handleReset(name) {
-        this.$refs[name].resetFields();
-      },
-      handleCheck(record,checked){
-          var self = this;
-  
-          var checkText = "";
-  
-          if(checked){
-              checkText="审核通过?";
-          }
-          else{
-              checkText="审核不通过?";
-          }
-  
-          self
-          .$confirm(checkText, "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-          })
-          .then(() => {
-              (function () {
-  
-                  self.formModel.id = record.id
-  
-                  if(checked){
-                      self.formModel.enabled = true
-                  }
-                  else{
-                      self.formModel.enabled = false
-                  }
-  
-                  return mobileBannerInfoApi.checkBannerInfo(self.formModel);
-                  
-              })().then(function (response) {
-                  var jsonData = response.data;
-  
-                  if (jsonData.result) {
-                      self.$message({
-                          message: "审核成功!",
-                          type: "success",
-                      });
-  
-                      self.changePage(self.pageIndex);
-  
-                  } else {
-                  self.$message({
-                      message: jsonData.message + "",
-                      type: "warning",
-                  });
-                  }
-              });
-          })
-      },
-      handleAdd() {
-        this.modalTitle = "新增";
-        this.businessKey = "";
-        this.showModal = true;
-      },
-      handleEdit(record) {
-        this.modalTitle = "编辑";
-        this.businessKey = record.id;
-        this.showModal = true;
-      },
-      handleDelete(record) {
-        var self = this;
-  
-        self
-          .$confirm("是否确认删除?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-          })
-          .then(() => {
-            mobileBannerInfoApi.remove(record.id).then(function (response) {
-              var jsonData = response.data;
-  
-              if (jsonData.result) {
-                // var index = self.tableData.indexOf(record);
-                // self.tableData.splice(index, 1);
-                self.changePage(self.pageIndex);
-  
-                self.$message({
-                  type: "success",
-                  message: "删除成功!",
-                });
-              }
-            });
-          });
-      },
-      handleBatchDelete() {
-        var self = this;
-  
-        var idList = this.multipleSelection.map((record) => {
-          return record.id;
-        });
-  
-        this.$confirm("是否确认删除选中项?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        }).then(() => {
-          mobileBannerInfoApi.batchRemove(idList).then(function (response) {
-            var jsonData = response.data;
-  
-            if (jsonData.result) {
-              self.changePage(self.pageIndex);
-  
-              self.$message({
-                type: "success",
-                message: "删除成功!",
-              });
-            }
-          });
-        });
-      },
-      onDetailModalClose(refreshed) {
-        //保存成功后回调
-        this.showModal = false;
-        this.showDeviceModal = false;
-  
-        if (refreshed) {
-          this.changePage(this.pageIndex);
-        }
-      },
-    },
-    mounted: function () {},
-    components: {
-      "mobileBannerInfo-detail": mobileBannerInfoDetail,
-    },
-  };
-  </script>
-  <style lang="scss" scoped>
-  .el-breadcrumb {
-    margin: 10px;
-    line-height: 20px;
-  }
-  
-  .el-divider {
-    margin: 5px 0;
-  }
-  
-  .demo-form-inline {
-    margin-left: 10px;
-    text-align: left;
-  }
-  
-  .button-group {
-    margin-left: 10px;
-    text-align: left;
-  }
-  </style>

+ 0 - 277
src/views/base/newsInfo-detail.vue

@@ -1,277 +0,0 @@
-
-<template>
-    <el-dialog
-      :visible.sync="showDialog"
-      :title="title"
-      :modal-append-to-body="false"
-      style="text-align: left;"
-      @close="closeDialog"
-      :close-on-click-modal="false"
-      width="900px"
-    >
-      <div class="user-panel" v-loading="loading">
-        <el-form
-          ref="form"
-          :model="formModel"
-          :rules="ruleValidate"
-          :label-width="'100px'"
-        >
-          <el-form-item label="标题" prop="title">
-            <el-input v-model="formModel.title" placeholder="请输入新闻标题" style="width: 300px"></el-input>
-          </el-form-item>
-          <el-form-item label="类型" prop="category">
-            <el-select v-model="formModel.category" filterable placeholder="请选择" clearable style="width:300px;">
-              <el-option
-                    v-for="result in categoryList"
-                    :key="result.id"
-                    :label="result.name"
-                    :value="result.value"
-                  ></el-option>
-              </el-select>
-          </el-form-item>
-          <el-form-item label="缩略图" prop="thumbnailImage">
-              <el-upload
-                  style="width:300px"
-                  class="avatar-uploader"
-                  name="photoFile"
-                  :action="uploadUrl"
-                  :headers="headers"
-                  :data="uploadData"
-                  :show-file-list="false"
-                  :on-success="handleAvatarSuccess"
-                  :before-upload="beforeAvatarUpload">
-                  <img v-if="fileUrl" :src="fileUrl" class="avatar">
-                  <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-              </el-upload>
-          </el-form-item>
-          <el-form-item label="二维码图片" prop="codeImage">
-              <el-upload
-                  style="width:300px"
-                  class="avatar-uploader"
-                  name="photoFile"
-                  :action="uploadUrl"
-                  :headers="headers"
-                  :data="uploadData"
-                  :show-file-list="false"
-                  :on-success="handleAvatarSuccess1"
-                  :before-upload="beforeAvatarUpload">
-                  <img v-if="fileUrl1" :src="fileUrl1" class="avatar">
-                  <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-              </el-upload>
-          </el-form-item>
-          <el-form-item label="新闻编号:" prop="id">
-            <span>{{formModel.id}}</span>
-          </el-form-item>
-          <el-form-item label="新闻内容" prop="content">
-            <mce-editor
-                ref="editor"
-                uploadName="upfile"
-                v-model="formModel.content"
-                :url="uploadUrl1"
-                :config="editorConfig"
-                style="width: 90%"
-            ></mce-editor>
-        </el-form-item>
-  
-        </el-form>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="closeDialog">取 消</el-button>
-        <el-button type="primary" @click="handleSubmit" :loading="submitting"
-          >确 定</el-button
-        >
-      </span>
-    </el-dialog>
-  </template>
-  <script>
-  import Constant from "@/constant";
-  import { getToken } from "@/utils/auth"; // get token from cookie
-  import newsInfoApi from "@/api/base/newsInfo";
-  import MceEditor from "@/components/Tinymce";
-  import dataDictionaryApi from "@/api/sys/dataDictionary";
-  
-  export default {
-    props: ["businessKey", "title"],
-    data() {
-      return {
-          showPwd: true,
-          ruleValidate: {
-              title: [
-              { required: true, message: "标题不能为空", trigger: "blur" },
-              ],
-              category: [
-              { required: true, message: "类型不能为空", trigger: "blur" },
-              ],
-          },
-          roleList: [],
-          formModel: {},
-          showDialog: true,
-          loading: false,
-          submitting: false,
-          companyProps: {
-              value: "id",
-              label: "name",
-          },
-          categoryList:[],
-          //上传地址
-          uploadUrl: Constant.serverUrl + "/uploadPicture",
-          uploadData: {
-              subFolder: "temporary-workers",
-          },
-          fileUrl: "",
-          fileUrl1: "",
-          headers: {
-              Authorization: getToken(),
-          },
-          uploadUrl1: Constant.serverUrl + "/tinymce/upload?token=" + getToken(),
-          editorConfig: {
-            height: 300,
-            width: 660,
-          },
-      };
-    },
-    created() {
-        dataDictionaryApi.findByCatalogName({catalogName: "新闻类型",})
-        .then((response) => {
-            var jsonData = response.data;
-            this.categoryList = jsonData.data;
-        });
-    },
-    methods: {
-      closeDialog() {
-        this.$emit("close", false);
-      },
-      handleSubmit() {
-        var self = this;
-  
-        this.$refs["form"].validate((valid) => {
-          if (valid) {
-            (function () {
-              var id = self.formModel.id;
-  
-              if (id == null || id.length == 0) {
-                return newsInfoApi.add(self.formModel);
-              } else {
-                return newsInfoApi.update(self.formModel);
-              }
-            })().then(function (response) {
-              var jsonData = response.data;
-  
-              if (jsonData.result) {
-                self.$message({
-                  message: "保存成功!",
-                  type: "success",
-                });
-  
-                self.$emit("close", true);
-              } else {
-                self.$message({
-                  message: jsonData.message + "",
-                  type: "warning",
-                });
-  
-                self.$emit("close", false);
-              }
-            });
-          }
-        });
-      },
-      handleAvatarSuccess(res, file) {
-          var self = this;
-          self.formModel.thumbnailImage = res.data;
-  
-          self.fileUrl =
-            res.data + "?x-oss-process=image/resize,m_lfit,h_300,w_300";
-      },
-      handleAvatarSuccess1(res, file) {
-          var self = this;
-          self.formModel.codeImage = res.data;
-  
-          self.fileUrl1 =
-            res.data + "?x-oss-process=image/resize,m_lfit,h_300,w_300";
-      },
-      beforeAvatarUpload(file) {
-          const isLt2M = file.size / 1024 / 1024 < 2;
-          if (!isLt2M) {
-              this.$message.error('上传头像图片大小不能超过 2MB!');
-          }
-          return  isLt2M;
-      }
-    },
-    async mounted() {
-      var self = this;
-      self.loading = true;
-  
-      (function () {
-        if (self.businessKey != null && self.businessKey.length > 0) {
-          return newsInfoApi.edit(self.businessKey);
-        } else {
-          return newsInfoApi.create();
-        }
-      })()
-        .then((response) => {
-          var jsonData = response.data;
-  
-          if (jsonData.result) {
-            self.formModel = jsonData.data;
-
-            let thumbnailImage = self.formModel.thumbnailImage;
-            if (thumbnailImage != null) {
-                self.fileUrl = thumbnailImage 
-            }
-
-            let codeImage = self.formModel.codeImage;
-            if (codeImage != null) {
-                self.fileUrl1 = codeImage 
-            }
-
-            if (self.formModel.content != null) {
-                self.$refs.editor.setContent(self.formModel.content);
-            }
-
-            self.showModal = true;
-          } else {
-            self.$message.error(jsonData.message + "");
-          }
-  
-          self.loading = false;
-        })
-        .catch((error) => {
-          self.$message.error(error + "");
-          self.loading = false;
-        });
-    },
-    components: {
-        "mce-editor": MceEditor,
-    },
-  };
-  </script>
-  <style scoped>
-  .user-panel {
-    margin: 10px auto;
-  }
-  
-  .avatar-uploader .el-upload {
-      border: 1px dashed #d9d9d9;
-      border-radius: 6px;
-      cursor: pointer;
-      position: relative;
-      overflow: hidden;
-    }
-    .avatar-uploader .el-upload:hover {
-      border-color: #409EFF;
-    }
-    .avatar-uploader-icon {
-      font-size: 28px;
-      color: #8c939d;
-      width: 178px;
-      height: 178px;
-      line-height: 178px;
-      text-align: center;
-    }
-    .avatar {
-      width: 178px;
-      height: 178px;
-      display: block;
-    }
-  </style>

+ 0 - 338
src/views/base/newsInfo-list.vue

@@ -1,338 +0,0 @@
-<template>
-    <div>
-      <el-breadcrumb separator=">">
-        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-        <el-breadcrumb-item>
-          <a href="#">基础信息管理</a>
-        </el-breadcrumb-item>
-        <el-breadcrumb-item>
-          新闻管理
-        </el-breadcrumb-item>
-      </el-breadcrumb>
-      <el-divider></el-divider>
-      <!--
-        要resetFields起作用,必须配置:model和prop
-      -->
-      <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
-        <el-form-item label="标题" prop="title">
-          <el-input type="text" size="mini" v-model="queryModel.title"></el-input>
-        </el-form-item>
-        <el-form-item label="类型" prop="category">
-          <el-select v-model="queryModel.category" placeholder="请选择" size="mini">
-            <el-option
-              v-for="item in categoryList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button
-            type="primary"
-            size="mini"
-            icon="ios-search"
-            @click="changePage(1)"
-            :loading="loading"
-          >查询</el-button>&nbsp;
-          <el-button
-            type="info"
-            size="mini"
-            style="margin-left: 8px"
-            @click="handleReset('queryForm')"
-          >重置</el-button>&nbsp;
-        </el-form-item>
-      </el-form>
-      <el-divider></el-divider>
-      <el-row class="button-group">
-        <el-button type="primary" size="small" plain icon="el-icon-circle-plus" @click="handleAdd">新增</el-button>
-        <el-button
-          type="primary"
-          size="small"
-          plain
-          icon="el-icon-remove"
-          :disabled="multipleSelection.length==0"
-          @click="handleBatchDelete"
-        >删除选中项</el-button>
-      </el-row>
-      <el-table
-        :data="tableData"
-        style="min-height:400px;"
-        v-loading="loading"
-        stripe
-        @sort-change="sortChange"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column  prop="thumbnailImage"  label="缩略图">
-            <template slot-scope="{row}">
-            <a v-if="row.thumbnailImage" :href="row.thumbnailImage" target="_blank">
-              <el-image
-              style="width: 50px; height: 50px"
-              :src="row.thumbnailImage"
-              fit="fit"></el-image>
-            </a>
-          </template>
-        </el-table-column>
-        <el-table-column  prop="title"  label="标题"></el-table-column>
-        <el-table-column  prop="categoryN"  label="类型"></el-table-column>
-        <el-table-column  prop="browseNumber"  label="浏览次数"></el-table-column>
-        <el-table-column  prop="status"  label="审核状态">
-          <template slot-scope="{row}">
-            <span v-if="row.status=='0'" style="color: #F56C6C;">未审核</span>
-            <span v-else-if="row.status=='1'" style="color: #67C23A;">已审核</span>
-          </template>
-        </el-table-column>
-        <el-table-column  prop="createTime"  label="发布时间"></el-table-column>
-        <el-table-column label="操作" width="250">
-          <template slot-scope="{row}" >
-            <el-button size="mini" type="warning" @click="handleEdit(row)">编辑</el-button>
-            <el-button v-if="row.status=='0'" size="mini" type="primary" @click="handleCheck(row)">审核</el-button>
-            <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-        :current-page.sync="pageIndex"
-        :total="totalElements"
-        :page-sizes="pageSizeList"
-        @current-change="changePage"
-        @size-change="pageSizeChange"
-        layout="total, sizes, prev, pager, next, jumper"
-      ></el-pagination>
-      <newsInfo-detail
-        v-if="showModal"
-        ref="userDetail"
-        :businessKey="businessKey"
-        :title="modalTitle"
-        @close="onDetailModalClose"
-      ></newsInfo-detail>
-    </div>
-  </template>
-  <script>
-  import newsInfoApi from "@/api/base/newsInfo";
-  import newsInfoDetail from "./newsInfo-detail";
-  import dataDictionaryApi from "@/api/sys/dataDictionary";
-  
-  export default {
-    name: 'baseNewsInfoList',
-    data() {
-      var self = this;
-  
-      return {
-        queryModel: {
-          title: "",
-          category:"",
-        },
-        loading: false,
-        tableData: [],
-        pageIndex: 1,
-        pageSize: 10,
-        totalPages: 0,
-        totalElements: 0,
-        field: "",
-        direction: "",
-        pageSizeList: [10, 20, 30],
-        multipleSelection: [],
-        modalTitle: "",      
-        businessKey: "",
-        showModal: false,
-        dialogFormVisible:false,
-        newPassword:"",
-        categoryList:[],
-        props: {
-          // 配置项(必选)
-          value: "id",
-          label: "name",
-          children: "children"
-        },
-      };
-    },
-    created() {
-        dataDictionaryApi.findByCatalogName({catalogName: "新闻类型",})
-        .then((response) => {
-            var jsonData = response.data;
-            this.categoryList = jsonData.data;
-        });
-    },
-    methods: {
-      changePage(pageIndex) {
-        var self = this;
-  
-        console.log(pageIndex);
-  
-        self.pageIndex = pageIndex;
-        var formData = new FormData();
-  
-        formData.append("pageIndex", self.pageIndex);
-        formData.append("pageSize", self.pageSize);
-  
-        formData.append("title", self.queryModel.title);
-        formData.append("category", self.queryModel.category);
-        
-        
-  
-        self.loading = true;
-  
-        newsInfoApi.pageList(formData).then(function(response) {
-          self.loading = false;
-  
-          var jsonData = response.data;
-  
-          if(jsonData.result){
-            var pageInfo = jsonData.data;
-  
-            self.tableData = pageInfo.data;
-            self.totalPages = pageInfo.totalPages;
-            self.totalElements = pageInfo.recordsTotal;
-          }
-          else {
-            self.$message({
-                message: jsonData.message + "",
-                type: "warning"
-              });
-          }
-        }).catch((error)=>{
-          self.loading = false;
-        });
-      },
-      pageSizeChange(pageSize) {
-        this.pageSize = pageSize;
-      },
-      sortChange(data) {
-        this.field = data.column.field;
-        this.direction = data.order == "ascending" ? "asc" : "desc";
-  
-        this.changePage(this.pageIndex);
-      },
-      handleSelectionChange(val) {
-        this.multipleSelection = val;
-      },
-      handleReset(name) {
-        this.$refs[name].resetFields();
-      },
-      handleAdd() {
-        var self = this;
-        
-        self.modalTitle = "新增新闻";
-        self.businessKey = "";
-        self.showModal = true;
-      },
-      handleEdit(record) {
-        var self = this;
-        
-        self.modalTitle = "编辑新闻";
-        self.businessKey = record.id;
-        self.showModal = true;
-      },
-      handleDelete(record) {
-        var self = this;
-  
-        this.$confirm("是否确认删除?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-            newsInfoApi.remove(record.id).then(function(response) {
-            var jsonData = response.data;
-  
-            if (jsonData.result) {
-              // var index = self.tableData.indexOf(record);
-              // self.tableData.splice(index, 1);
-              self.changePage(self.pageIndex);
-  
-              self.$message({
-                type: "success",
-                message: "删除成功!"
-              });
-            }
-          });
-        });
-      },
-      handleBatchDelete() {
-        var self = this;
-  
-        var idList = this.multipleSelection.map(record => {
-          return record.id;
-        });
-  
-        this.$confirm("是否确认删除选中项?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-            newsInfoApi.batchRemove(idList).then(function(response) {
-            var jsonData = response.data;
-  
-            if (jsonData.result) {
-              self.changePage(self.pageIndex);
-  
-              self.$message({
-                type: "success",
-                message: "删除成功!"
-              });
-            }
-          });
-        });
-      },
-      onDetailModalClose(refreshed) {
-        this.showModal = false;
-  
-        if(refreshed) {
-          this.changePage(this.pageIndex);
-        }
-      },
-      handleCheck(record){
-        var self = this;
-  
-        this.$confirm("是否确认审核?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          newsInfoApi.check(record.id).then(function(response) {
-            var jsonData = response.data;
-
-            if (jsonData.result) {
-              // var index = self.tableData.indexOf(record);
-              // self.tableData.splice(index, 1);
-              self.changePage(self.pageIndex);
-
-              self.$message({
-                type: "success",
-                message: "审核成功!"
-              });
-            }
-          });
-        });
-      },
-    },
-    mounted: function() {
-      var self = this;
-      this.changePage(1);
-    },
-    components: {
-        "newsInfo-detail":newsInfoDetail
-    }
-  };
-  </script>
-  <style lang="scss" scoped>
-  .el-breadcrumb {
-    margin: 10px;
-    line-height: 20px;
-  }
-  
-  .el-divider {
-    margin: 5px 0;
-  }
-  
-  .demo-form-inline {
-    margin-left: 10px;
-    text-align: left;
-  }
-  
-  .button-group {
-    padding: 10px;
-    text-align: left;
-  }
-  </style>

+ 0 - 260
src/views/base/personInfo-detail.vue

@@ -1,260 +0,0 @@
-
-<template>
-  <el-dialog
-    :visible.sync="showDialog"
-    :title="title"
-    :modal-append-to-body="false"
-    style="text-align: left;"
-    @close="closeDialog"
-    :close-on-click-modal="false"
-    width="900px"
-  >
-    <div class="user-panel" v-loading="loading">
-      <el-form
-        ref="form"
-        :model="formModel"
-        :rules="ruleValidate"
-        :label-width="'100px'"
-        :inline="true"
-      >
-        <el-form-item label="用户名" prop="userName">
-          <el-input v-model="formModel.userName" placeholder="请输入用户名" style="width: 300px"></el-input>
-        </el-form-item>
-        <el-form-item label="真实姓名" prop="realName">
-          <el-input v-model="formModel.realName" placeholder="请输入真实姓名" style="width: 300px"></el-input>
-        </el-form-item>
-        <el-form-item label="联系电话" prop="phone">
-          <el-input v-model="formModel.phone" placeholder="请输入联系电话" style="width: 300px"></el-input>
-        </el-form-item>
-        <el-form-item label="身份证号" prop="idCard">
-          <el-input v-model="formModel.idCard" placeholder="请输入身份证号" style="width: 300px"></el-input>
-        </el-form-item>
-        <!-- <el-form-item label="年龄" prop="age">
-          <el-input v-model="formModel.age" placeholder="请输入年龄" style="width: 300px"></el-input>
-        </el-form-item>
-        <el-form-item label="性别" prop="gender">
-            <el-radio-group v-model="formModel.gender" style="width: 300px">
-                <el-radio label="0">男</el-radio>
-                <el-radio label="1">女</el-radio>
-            </el-radio-group>
-        </el-form-item> -->
-        <el-form-item label="关联企业" prop="enterpriseId">
-          <el-select
-            v-model="formModel.enterpriseId"
-            placeholder="请选择"
-            style="width: 300px"
-            clearable
-          >
-            <el-option
-              v-for="item in enterpriseList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="照片" prop="photo">
-            <el-upload
-                style="width:300px"
-                class="avatar-uploader"
-                name="photoFile"
-                :action="uploadUrl"
-                :headers="headers"
-                :data="uploadData"
-                :show-file-list="false"
-                :on-success="handleAvatarSuccess"
-                :before-upload="beforeAvatarUpload">
-                <img v-if="fileUrl" :src="fileUrl" class="avatar">
-                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-            </el-upload>
-        </el-form-item>
-      </el-form>
-    </div>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="closeDialog">取 消</el-button>
-      <el-button type="primary" @click="handleSubmit" :loading="submitting"
-        >确 定</el-button
-      >
-    </span>
-  </el-dialog>
-</template>
-<script>
-import Constant from "@/constant";
-import { getToken } from "@/utils/auth"; // get token from cookie
-import personInfoApi from "@/api/base/personInfo";
-import enterpriseInfoApi from "@/api/base/enterpriseInfo";
-
-export default {
-  props: ["businessKey", "title"],
-  data() {
-    return {
-        showPwd: true,
-        ruleValidate: {
-            userName: [
-            { required: true, message: "用户名不能为空", trigger: "blur" },
-            ],
-            realName: [
-            { required: true, message: "真实名称不能为空", trigger: "blur" },
-            ],
-            phone: [
-            { required: true, message: "联系电话不能为空", trigger: "blur" },
-            ],
-            idCard: [
-            { required: true, message: "身份证号不能为空", trigger: "blur" },
-            ],
-            age: [
-            { required: true, message: "年龄不能为空", trigger: "blur" },
-            ],
-            gender: [
-            { required: true, message: "性别不能为空", trigger: "blur" },
-            ],
-        },
-        roleList: [],
-        formModel: {},
-        showDialog: true,
-        loading: false,
-        submitting: false,
-        enterpriseList:[],
-        //上传地址
-        uploadUrl: Constant.serverUrl + "/uploadPicture",
-        uploadData: {
-            subFolder: "emporary-workers",
-        },
-        fileUrl: "",
-        headers: {
-            Authorization: getToken(),
-        },
-    };
-  },
-  created() {
-    var self = this;
-
-    enterpriseInfoApi.list().then(function (response) {
-    var jsonData = response.data;
-    if (jsonData.result) {
-        if (jsonData.data != null && jsonData.data != "") {
-            self.enterpriseList = jsonData.data;
-        }
-    }
-    });
-  },
-  methods: {
-    closeDialog() {
-      this.$emit("close", false);
-    },
-    handleSubmit() {
-      var self = this;
-
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          (function () {
-            var id = self.formModel.id;
-
-            if (id == null || id.length == 0) {
-              return personInfoApi.add(self.formModel);
-            } else {
-              return personInfoApi.update(self.formModel);
-            }
-          })().then(function (response) {
-            var jsonData = response.data;
-
-            if (jsonData.result) {
-              self.$message({
-                message: "保存成功!",
-                type: "success",
-              });
-
-              self.$emit("close", true);
-            } else {
-              self.$message({
-                message: jsonData.message + "",
-                type: "warning",
-              });
-
-              self.$emit("close", false);
-            }
-          });
-        }
-      });
-    },
-    handleAvatarSuccess(res, file) {
-        var self = this;
-        self.formModel.photo = res.data;
-
-        self.fileUrl =
-          res.data + "?x-oss-process=image/resize,m_lfit,h_300,w_300";
-    },
-    beforeAvatarUpload(file) {
-        const isLt2M = file.size / 1024 / 1024 < 2;
-        if (!isLt2M) {
-            this.$message.error('上传头像图片大小不能超过 2MB!');
-        }
-        return isLt2M;
-    }
-  },
-  async mounted() {
-    var self = this;
-    self.loading = true;
-
-    (function () {
-      if (self.businessKey != null && self.businessKey.length > 0) {
-        return personInfoApi.edit(self.businessKey);
-      } else {
-        return personInfoApi.create();
-      }
-    })()
-      .then((response) => {
-        var jsonData = response.data;
-
-        if (jsonData.result) {
-            self.formModel = jsonData.data;
-
-            let photo = self.formModel.photo;
-            if (photo != null) {
-                self.fileUrl = photo 
-            }
-
-            self.showModal = true;
-        } else {
-          self.$message.error(jsonData.message + "");
-        }
-
-        self.loading = false;
-      })
-      .catch((error) => {
-        self.$message.error(error + "");
-        self.loading = false;
-      });
-  },
-  components: {
-  },
-};
-</script>
-<style scoped>
-.user-panel {
-  margin: 10px auto;
-}
-.avatar-uploader .el-upload {
-    border: 1px dashed #d9d9d9;
-    border-radius: 6px;
-    cursor: pointer;
-    position: relative;
-    overflow: hidden;
-  }
-  .avatar-uploader .el-upload:hover {
-    border-color: #409EFF;
-  }
-  .avatar-uploader-icon {
-    font-size: 28px;
-    color: #8c939d;
-    width: 178px;
-    height: 178px;
-    line-height: 178px;
-    text-align: center;
-  }
-  .avatar {
-    width: 178px;
-    height: 178px;
-    display: block;
-  }
-</style>

+ 0 - 500
src/views/base/personInfo-list.vue

@@ -1,500 +0,0 @@
-<template>
-    <div>
-      <el-breadcrumb separator=">">
-        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-        <el-breadcrumb-item>
-          <a href="#">基础信息管理</a>
-        </el-breadcrumb-item>
-        <el-breadcrumb-item>
-          用户管理
-        </el-breadcrumb-item>
-      </el-breadcrumb>
-      <el-divider></el-divider>
-      <!--
-        要resetFields起作用,必须配置:model和prop
-      -->
-      <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
-        <el-form-item label="姓名" prop="realName">
-          <el-input type="text" size="mini" v-model="queryModel.realName"></el-input>
-        </el-form-item>
-        <el-form-item label="联系电话" prop="phone">
-          <el-input type="text" size="mini" v-model="queryModel.phone"></el-input>
-        </el-form-item>
-        <el-form-item label="身份证号" prop="idCard">
-          <el-input type="text" size="mini" v-model="queryModel.idCard"></el-input>
-        </el-form-item>
-        <el-form-item label="认证状态" prop="status">
-          <el-select v-model="queryModel.status" size="mini" filterable placeholder="请选择" clearable>
-            <el-option
-                  v-for="result in statusList"
-                  :key="result.id"
-                  :label="result.name"
-                  :value="result.value"
-                ></el-option>
-            </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button
-            type="primary"
-            size="mini"
-            icon="ios-search"
-            @click="changePage(1)"
-            :loading="loading"
-          >查询</el-button>&nbsp;
-          <el-button
-            type="info"
-            size="mini"
-            style="margin-left: 8px"
-            @click="handleReset('queryForm')"
-          >重置</el-button>&nbsp;
-        </el-form-item>
-      </el-form>
-      <el-divider></el-divider>
-      <el-row class="button-group">
-        <el-button type="primary" size="small" plain icon="el-icon-circle-plus" @click="handleAdd">新增</el-button>
-        <el-button
-          type="primary"
-          size="small"
-          plain
-          icon="el-icon-remove"
-          :disabled="multipleSelection.length==0"
-          @click="handleBatchDelete"
-        >删除选中项</el-button>
-        <el-button
-          type="primary"
-          size="small"
-          plain
-          icon="el-icon-upload"
-          @click="batchImportVisible = true"
-        >导入</el-button>
-        <el-button
-          type="primary"
-          size="small"
-          plain
-          icon="el-icon-upload2"
-          @click="exportXls"
-        >导出数据</el-button>
-      </el-row>
-      <el-table
-        :data="tableData"
-        style="min-height:400px;"
-        v-loading="loading"
-        stripe
-        @sort-change="sortChange"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column  prop="realName"  label="姓名"></el-table-column>
-        <el-table-column  prop="phone"  label="联系电话"></el-table-column>
-        <el-table-column  prop="idCard"  label="身份证号" width="180"></el-table-column>
-        <el-table-column  prop="gender"  label="性别">
-            <template slot-scope="{row}">
-                <span v-if="row.gender=='0'">女</span>
-                <span v-else-if="row.gender=='1'">男</span>
-          </template>
-        </el-table-column>
-        <el-table-column  prop="age"  label="年龄"></el-table-column>
-        <el-table-column  prop="lastLoginTime"  label="最后登录时间" width="180"></el-table-column>
-        <el-table-column  prop="applicationCheckTime"  label="申请认证时间" width="180"></el-table-column>
-        <el-table-column  prop="checkTime"  label="认证时间" width="180"></el-table-column>
-        <el-table-column  prop="status"  label="认证状态">
-            <template slot-scope="{row}">
-                <span v-if="row.status=='0'" style="color: #F56C6C;">未认证</span>
-                <span v-else-if="row.status=='1'" style="color: #67C23A;">已认证</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作">
-          <template slot-scope="{row}" >
-            <el-link type="primary" @click="handleEdit(row)">编辑--</el-link>
-            <el-link type="success" v-if="row.status==0&&row.idCard!=null" @click="handleCheck(row)">认证--</el-link>
-            <el-link type="danger" @click="handleDelete(row)">删除</el-link>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-        :current-page.sync="pageIndex"
-        :total="totalElements"
-        :page-sizes="pageSizeList"
-        @current-change="changePage"
-        @size-change="pageSizeChange"
-        layout="total, sizes, prev, pager, next, jumper"
-      ></el-pagination>
-      <personInfo-detail
-        v-if="showModal"
-        ref="userDetail"
-        :businessKey="businessKey"
-        :title="modalTitle"
-        @close="onDetailModalClose"
-      ></personInfo-detail>
-      <el-dialog
-      title="批量导入人员"
-      :visible.sync="batchImportVisible"
-      :modal-append-to-body="false"
-      style="text-align: left"
-      :close-on-click-modal="false"
-    >
-      <el-form label-width="150px">
-        <el-form-item label="模板下载">
-          <el-link
-            href="https://oss.xiaoxinda.com/jk-temporary-workers/person.xls"
-            type="primary"
-            target="_blank"
-            >点击下载模板</el-link
-          >
-        </el-form-item>
-        <el-form-item label="上传文件">
-          <el-upload
-            class="upload-demo"
-            accept=".xls"
-            :action="uploadUrlXls"
-            :data="uploadXlsData"
-            :headers="headers"
-            :on-preview="handleBatchImportPreview"
-            name="uploadFile"
-            :multiple="true"
-            :limit="1"
-            :on-remove="handleBatchImportRemove"
-            :before-remove="beforeBatchImportRemove"
-            :before-upload="beforeUpload"
-            :on-exceed="handleBatchImportExceed"
-            :on-success="handleBatchImportSuccess"
-            :file-list="batchImportFileList"
-          >
-            <el-button size="small" type="primary" :loading="xlsLoading"
-              >点击上传</el-button
-            >
-            <div slot="tip" class="el-upload__tip">
-              只能上传xls文件,且不超过500kb
-            </div>
-          </el-upload>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="batchImportVisible = false"
-          >关 闭</el-button
-        >
-      </div>
-    </el-dialog>
-    </div>
-  </template>
-  <script>
-  import Constant from "@/constant";
-  import personInfoApi from "@/api/base/personInfo";
-  import personInfoDetail from "./personInfo-detail";
-  import { getToken } from "@/utils/auth"; // get token from cookie
-  
-  export default {
-    name: 'basePersonInfoList',
-    data() {
-      var self = this;
-  
-      return {
-        queryModel: {
-          realName: "",
-          phone:"",
-          idCard:"",
-          status:"",
-        },
-        loading: false,
-        tableData: [],
-        pageIndex: 1,
-        pageSize: 10,
-        totalPages: 0,
-        totalElements: 0,
-        field: "",
-        direction: "",
-        pageSizeList: [10, 20, 30],
-        multipleSelection: [],
-        modalTitle: "",      
-        businessKey: "",
-        showModal: false,
-        dialogFormVisible:false,
-        newPassword:"",
-        roleResult:[],
-        props: {
-          // 配置项(必选)
-          value: "id",
-          label: "name",
-          children: "children"
-        },
-        batchImportVisible: false,
-        xlsLoading: false,
-        batchImportFileList: [],
-        chargingStationResult:[],
-        uploadUrlXls: Constant.serverUrl + "/base/personInfo/importXls",
-        uploadXlsData: {
-            subFolder: "personInfo",
-        },
-        headers: {
-            Authorization: getToken(),
-        },
-        statusList:[
-          {
-            "id":"0",
-            "name":"未认证",
-            "value":"0"
-          },
-          {
-            "id":"1",
-            "name":"已认证",
-            "value":"1"
-          }
-        ],
-      };
-    },
-    methods: {
-      changePage(pageIndex,exportFlag) {
-        var self = this;
-  
-        console.log(pageIndex);
-  
-        self.pageIndex = pageIndex;
-        var formData = new FormData();
-  
-        formData.append("pageIndex", self.pageIndex);
-        
-        if(exportFlag!=null){
-            formData.append("exportFlag", exportFlag);
-            formData.append("pageSize", 10000);
-        }
-        else{
-            formData.append("pageSize", self.pageSize);
-        }
-        formData.append("realName", self.queryModel.realName);
-        formData.append("phone", self.queryModel.phone);
-        formData.append("idCard", self.queryModel.idCard);
-        formData.append("status", self.queryModel.status);
-  
-        self.loading = true;
-  
-        personInfoApi.pageList(formData).then(function(response) {
-          self.loading = false;
-            var jsonData = response.data;
-            if(jsonData.result) {
-                if(exportFlag){
-                    //导出
-                    self.$message({
-                        showClose: true,
-                        type: "success",
-                        message: `报表已生成,<a href="${jsonData.data}">请点击链接下载</a>`,
-                        dangerouslyUseHTMLString: true,
-                        duration: 30000
-                    });
-                }
-                else{
-                    //分页查看
-                    var page = jsonData.data;
-
-                    self.tableData = page.data;
-                    self.totalPages = page.totalPages;
-                    self.totalElements = page.recordsTotal;
-                }
-            }
-            else{
-                self.$message.warning(jsonData.message);
-            }
-        }).catch((error)=>{
-          self.loading = false;
-        });
-      },
-      pageSizeChange(pageSize) {
-        this.pageSize = pageSize;
-      },
-      sortChange(data) {
-        this.field = data.column.field;
-        this.direction = data.order == "ascending" ? "asc" : "desc";
-  
-        this.changePage(this.pageIndex);
-      },
-      handleSelectionChange(val) {
-        this.multipleSelection = val;
-      },
-      handleReset(name) {
-        this.$refs[name].resetFields();
-      },
-      handleAdd() {
-        var self = this;
-        
-        self.modalTitle = "新增用户";
-        self.businessKey = "";
-        self.showModal = true;
-      },
-      handleEdit(record) {
-        var self = this;
-        
-        self.modalTitle = "编辑用户";
-        self.businessKey = record.id;
-        self.showModal = true;
-      },
-      handleDelete(record) {
-        var self = this;
-  
-        this.$confirm("是否确认删除?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-            personInfoApi.remove(record.id).then(function(response) {
-            var jsonData = response.data;
-  
-            if (jsonData.result) {
-              // var index = self.tableData.indexOf(record);
-              // self.tableData.splice(index, 1);
-              self.changePage(self.pageIndex);
-  
-              self.$message({
-                type: "success",
-                message: "删除成功!"
-              });
-            }
-          });
-        });
-      },
-      handleBatchDelete() {
-        var self = this;
-  
-        var idList = this.multipleSelection.map(record => {
-          return record.id;
-        });
-  
-        this.$confirm("是否确认删除选中项?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-            personInfoApi.batchRemove(idList).then(function(response) {
-            var jsonData = response.data;
-  
-            if (jsonData.result) {
-              self.changePage(self.pageIndex);
-  
-              self.$message({
-                type: "success",
-                message: "删除成功!"
-              });
-            }
-          });
-        });
-      },
-      exportXls() {
-        this.changePage(1,true);
-      },
-      handleCheck(record){
-        var self = this;
-  
-        this.$confirm("是否确认审核?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          personInfoApi.check(record.id).then(function(response) {
-            var jsonData = response.data;
-
-            if (jsonData.result) {
-              // var index = self.tableData.indexOf(record);
-              // self.tableData.splice(index, 1);
-              self.changePage(self.pageIndex);
-
-              self.$message({
-                type: "success",
-                message: "审核成功!"
-              });
-            }
-          });
-        });
-      },
-        onDetailModalClose(refreshed) {
-            this.showModal = false;
-    
-            if(refreshed) {
-            this.changePage(this.pageIndex);
-            }
-        },
-        beforeUpload(file, fileList) {
-            //导入前判断
-            var self = this;
-            self.xlsLoading = true;
-            return true;
-        },
-        //批量导入-上传成功
-        handleBatchImportSuccess(response, file, fileList) {
-        var self = this;
-        self.xlsLoading = false;
-
-        if (response.result) {
-            self.$message.success(response.message);
-            this.batchImportFileList = [];
-            this.changePage(1);
-
-
-        } else {
-            //this.$message.error(response.message);
-            this.batchImportFileList = [];
-            this.changePage(1);
-
-            if (response.data != null) {
-            //下载有错误信息提示的报表
-            //window.open(response.data);
-            self.$message({
-                showClose: true,
-                dangerouslyUseHTMLString: true,
-                message:
-                response.message +
-                `,<a href="${response.data}" target="_blank">点击下载未导入的数据报表</a>&nbsp;`,
-                duration: 30000,
-            });
-            }
-        }
-
-        this.batchImportVisible = false;
-        },
-        //批量导入-预览
-        handleBatchImportPreview(file) {
-        console.log(file.url);
-        },
-        //批量导入-移除
-        handleBatchImportRemove(file, fileList) {
-        console.log(file, fileList);
-        },
-        //批量导入-移除前操作
-        beforeBatchImportRemove(file, fileList) {
-        console.log(file, fileList);
-        },
-        //批量导入-文件超出个数限制时的钩子
-        handleBatchImportExceed(files, fileList) {
-        this.$message.warning(
-            `当前限制选择 3 个文件,本次选择了 ${files.length} 个文件,共选择了 ${
-            files.length + fileList.length
-            } 个文件`
-        );
-        },
-    },
-    mounted: function() {
-      var self = this;
-      this.changePage(1);
-    },
-    components: {
-        "personInfo-detail":personInfoDetail
-    }
-  };
-  </script>
-  <style lang="scss" scoped>
-  .el-breadcrumb {
-    margin: 10px;
-    line-height: 20px;
-  }
-  
-  .el-divider {
-    margin: 5px 0;
-  }
-  
-  .demo-form-inline {
-    margin-left: 10px;
-    text-align: left;
-  }
-  
-  .button-group {
-    padding: 10px;
-    text-align: left;
-  }
-  </style>

+ 0 - 368
src/views/base/recruitInformationInfo-detail.vue

@@ -1,368 +0,0 @@
-
-<template>
-    <el-dialog
-      :visible.sync="showDialog"
-      :title="title"
-      :modal-append-to-body="false"
-      style="text-align: left;"
-      @close="closeDialog"
-      :close-on-click-modal="false"
-      width="900px"
-    >
-      <div class="user-panel" v-loading="loading">
-        <el-form
-          ref="form"
-          :model="formModel"
-          :rules="ruleValidate"
-          :label-width="'100px'"
-          :inline="true"
-        >
-          <el-form-item label="选择企业" prop="enterpriseId">
-            <el-select
-            filterable 
-            v-model="formModel.enterpriseId"
-            placeholder="请选择"
-            style="width: 300px"
-            clearable
-          >
-            <el-option
-              v-for="item in enterpriseList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
-          </el-select>
-          </el-form-item>
-          <el-form-item label="行业" prop="industry">
-            <el-select v-model="formModel.industry" filterable placeholder="请选择" style="width: 300px" clearable>
-            <el-option
-                  v-for="result in intendedIndustriesList"
-                  :key="result.id"
-                  :label="result.name"
-                  :value="result.value"
-                ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="职位名称" prop="positionName">
-            <el-input v-model="formModel.positionName" placeholder="请输入职位名称" style="width: 300px"></el-input>
-          </el-form-item>
-          <el-form-item label="结算方式" prop="settlementMethod">
-            <el-select v-model="formModel.settlementMethod" @change="handChange"  style="width: 300px" filterable placeholder="请选择" clearable>
-            <el-option
-                  v-for="result in methodList"
-                  :key="result.id"
-                  :label="result.name"
-                  :value="result.value"
-                ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="薪资待遇" prop="salary">
-            <el-input v-model="formModel.salary" placeholder="请输入薪资待遇" style="width: 300px">
-              <template slot="append">{{unit}}</template>
-            </el-input>
-          </el-form-item>
-          <el-form-item label="招聘人数" prop="recruitingNumbers">
-            <el-input-number v-model="formModel.recruitingNumbers" :min="0" label="招聘人数"  style="width: 300px"></el-input-number>
-          </el-form-item>
-          <el-form-item label="年龄要求" prop="ageRequirement">
-            <el-input v-model="formModel.ageRequirement" placeholder="请输入年龄要求" style="width: 300px"></el-input>
-          </el-form-item>
-          <el-form-item label="工作描述" prop="desc">
-            <el-input
-              style="width: 710px"
-              type="textarea"
-              :rows="3"
-              placeholder="请输入内容"
-              v-model="formModel.desc">
-            </el-input>
-          </el-form-item>
-          <el-form-item label="联系人" prop="contacts">
-            <el-input v-model="formModel.contacts" placeholder="请输入联系人" style="width: 300px"></el-input>
-          </el-form-item>
-          <el-form-item label="联系电话" prop="contactsPhone">
-            <el-input v-model="formModel.contactsPhone" placeholder="请输入联系电话" style="width: 300px"></el-input>
-          </el-form-item>
-          <el-form-item label="工作地区" prop="workArea">
-            <el-input v-model="formModel.workArea" placeholder="请输入工作地区" style="width: 300px"></el-input>
-          </el-form-item>
-          <el-form-item label="详细地址" prop="address">
-            <el-input v-model="formModel.address" placeholder="请输入详细地址" style="width: 300px"></el-input>
-          </el-form-item>
-          <el-form-item label="图片">
-              <el-upload
-                name="photoFile"
-                :action="uploadUrl"
-                :headers="headers"
-                :data="uploadData"
-                list-type="picture-card"
-                :on-success="handlePictureCardPreview"
-                :on-remove="handleRemove"
-                :limit='5'
-                :file-list="fileList"
-              >
-                <i class="el-icon-plus"></i>
-                <div
-                  class="el-upload__tip"
-                  slot="tip"
-                  style="font-weight: bold"
-                >
-                  建议尺寸大小为192*128,大小不超过2M,图片不超过5张
-                </div>
-              </el-upload>
-              <el-dialog :visible.sync="dialogVisible">
-                <img width="100%" :src="formModel.dialogImageUrl" alt="" />
-              </el-dialog>
-            </el-form-item>
-        </el-form>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="closeDialog">取 消</el-button>
-        <el-button type="primary" @click="handleSubmit" :loading="submitting"
-          >确 定</el-button
-        >
-      </span>
-    </el-dialog>
-  </template>
-  <script>
-  import Constant from "@/constant";
-  import { getToken } from "@/utils/auth"; // get token from cookie
-  import recruitInformationInfoApi from "@/api/base/recruitInformationInfo";
-  import dataDictionaryApi from "@/api/sys/dataDictionary";
-  import enterpriseInfoApi from "@/api/base/enterpriseInfo";
-  
-  export default {
-    props: ["businessKey", "title"],
-    data() {
-      return {
-          showPwd: true,
-          ruleValidate: {
-              enterpriseId: [
-                { required: true, message: "请选择企业", trigger: "blur" },
-              ],
-              industry: [
-                { required: true, message: "行业不能为空", trigger: "blur" },
-              ],
-              positionName: [
-                { required: true, message: "职位名称不能为空", trigger: "blur" },
-              ],
-              salary: [
-                { required: true, message: "薪资待遇不能为空", trigger: "blur" },
-              ],
-              settlementMethod: [
-                { required: true, message: "结算方式不能为空", trigger: "blur" },
-              ],
-              recruitingNumbers: [
-                { required: true, message: "招聘人数不能为空", trigger: "blur" },
-              ],
-              desc: [
-                { required: true, message: "工作描述不能为空", trigger: "blur" },
-              ],
-              contacts: [
-                { required: true, message: "联系人不能为空", trigger: "blur" },
-              ],
-              contactsPhone: [
-                { required: true, message: "联系电话不能为空", trigger: "blur" },
-              ],
-              workArea: [
-                { required: true, message: "工作地区不能为空", trigger: "blur" },
-              ],
-              address: [
-                { required: true, message: "详细地址不能为空", trigger: "blur" },
-              ],
-          },
-          roleList: [],
-          formModel: {},
-          dialogVisible: false,
-          showDialog: true,
-          loading: false,
-          submitting: false,
-          intendedIndustriesList:[],
-          methodList:[],
-          enterpriseList:[],
-          unit:"",
-          //上传地址
-          fileList:[],
-          uploadUrl: Constant.serverUrl + "/uploadPicture",
-          uploadData: {
-              subFolder: "recruitInformationInfo",
-          },
-          fileUrl: "",
-          headers: {
-              Authorization: getToken(),
-          },
-          head_portraitUrl: "",
-          fileList1: [{name: 'food.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}, {name: 'food2.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}]
-      };
-    },
-    created() {
-        var self = this;
-        dataDictionaryApi.findByCatalogName({catalogName: "意向行业",})
-        .then((response) => {
-            var jsonData = response.data;
-            self.intendedIndustriesList = jsonData.data;
-        });
-
-        dataDictionaryApi.findByCatalogName({catalogName: "结算方式",})
-        .then((response) => {
-            var jsonData = response.data;
-            self.methodList = jsonData.data;
-        });
-
-        enterpriseInfoApi.list().then(function (response) {
-        var jsonData = response.data;
-        if (jsonData.result) {
-            if (jsonData.data != null && jsonData.data != "") {
-                self.enterpriseList = jsonData.data;
-            }
-        }
-        });
-    },
-    methods: {
-      closeDialog() {
-        this.$emit("close", false);
-      },
-      handleSubmit() {
-        var self = this;
-  
-        this.$refs["form"].validate((valid) => {
-          if (valid) {
-            (function () {
-              var id = self.formModel.id;
-
-              self.formModel.fileList = self.fileList;
-
-              //alert(JSON.stringify(self.fileList))
-  
-              if (id == null || id.length == 0) {
-                return recruitInformationInfoApi.add(self.formModel);
-              } else {
-                return recruitInformationInfoApi.update(self.formModel);
-              }
-            })().then(function (response) {
-              var jsonData = response.data;
-  
-              if (jsonData.result) {
-                self.$message({
-                  message: "保存成功!",
-                  type: "success",
-                });
-  
-                self.$emit("close", true);
-              } else {
-                self.$message({
-                  message: jsonData.message + "",
-                  type: "warning",
-                });
-  
-                self.$emit("close", false);
-              }
-            });
-          }
-        });
-      },
-      handChange(val){
-        if(val=="1"){
-          this.unit="元/日"
-        }
-        else if(val=="2"){
-          this.unit="元/周"
-        }
-        else if(val=="3"){
-          this.unit="元/月"
-        }
-      },
-      //老师风采-图片上传--移除
-      handleRemove(file) {
-        var self = this;
-        console.log(file.response);
-        //alert(JSON.stringify(file))
-        self.fileList.forEach(function(item, index) {
-            if(item["name"]==file.name){
-              self.fileList.splice(index,1);
-            }
-        })
-      },
-      //老师风采--图片上传数组
-      handlePictureCardPreview(res,file) {
-        console.log(file);
-        //alert(JSON.stringify(file))
-        var obj = {};
-        obj["name"]=file.name;
-        obj["url"]=res.data;
-        this.fileList.push(obj);
-        //alert(JSON.stringify(this.fileArr))
-        // this.formModel.dialogImageUrl.push(file.data);
-        // alert(JSON.stringify(this.formModel.dialogImageUrl))
-        this.dialogVisible = false;
-      },
-
-      enitPictureCardPreview(data) {
-        this.formModel.dialogImageUrl = data;
-        this.dialogVisible = false;
-      },
-    },
-    async mounted() {
-      var self = this;
-      self.loading = true;
-  
-      (function () {
-        if (self.businessKey != null && self.businessKey.length > 0) {
-          return recruitInformationInfoApi.edit(self.businessKey);
-        } else {
-          return recruitInformationInfoApi.create();
-        }
-      })()
-        .then((response) => {
-          var jsonData = response.data;
-  
-          if (jsonData.result) {
-            self.formModel = jsonData.data;
-
-            let fileList = jsonData.data.fileList;
-            
-            self.fileList = fileList;
-
-            self.showModal = true;
-          } else {
-            self.$message.error(jsonData.message + "");
-          }
-  
-          self.loading = false;
-        })
-        .catch((error) => {
-          self.$message.error(error + "");
-          self.loading = false;
-        });
-    },
-    components: {
-    },
-  };
-  </script>
-  <style scoped>
-  .user-panel {
-    margin: 10px auto;
-  }
-  .avatar-uploader .el-upload {
-    border: 1px dashed #d9d9d9;
-    border-radius: 6px;
-    cursor: pointer;
-    position: relative;
-    overflow: hidden;
-  }
-  .avatar-uploader .el-upload:hover {
-    border-color: #409EFF;
-  }
-  .avatar-uploader-icon {
-    font-size: 28px;
-    color: #8c939d;
-    width: 178px;
-    height: 178px;
-    line-height: 178px;
-    text-align: center;
-  }
-  .avatar {
-    width: 178px;
-    height: 178px;
-    display: block;
-  }
-  </style>

+ 0 - 703
src/views/base/recruitInformationInfo-list.vue

@@ -1,703 +0,0 @@
-<template>
-    <div>
-      <el-breadcrumb separator=">">
-        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-        <el-breadcrumb-item>
-          <a href="#">基础信息管理</a>
-        </el-breadcrumb-item>
-        <el-breadcrumb-item>
-          招聘信息管理
-        </el-breadcrumb-item>
-      </el-breadcrumb>
-      <el-divider></el-divider>
-      <!--
-        要resetFields起作用,必须配置:model和prop
-      -->
-      <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
-        <el-form-item label="企业名称" prop="name">
-          <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
-        </el-form-item>
-        <el-form-item label="行业" prop="intendedIndustries">
-          <el-select v-model="queryModel.intendedIndustries" size="mini" filterable placeholder="请选择" clearable>
-            <el-option
-                  v-for="result in intendedIndustriesList"
-                  :key="result.id"
-                  :label="result.name"
-                  :value="result.value"
-                ></el-option>
-            </el-select>
-        </el-form-item>
-        <el-form-item label="职位名称" prop="positionName">
-          <el-input type="text" size="mini" v-model="queryModel.positionName"></el-input>
-        </el-form-item>
-        <el-form-item label="结算方式" prop="method">
-          <el-select v-model="queryModel.method" size="mini" filterable placeholder="请选择" clearable>
-            <el-option
-                  v-for="result in methodList"
-                  :key="result.id"
-                  :label="result.name"
-                  :value="result.value"
-                ></el-option>
-            </el-select>
-        </el-form-item>
-        <el-form-item label="工作地区" prop="workArea">
-          <el-input type="text" size="mini" v-model="queryModel.workArea"></el-input>
-        </el-form-item>
-        <el-form-item label="审核状态" prop="status">
-          <el-select v-model="queryModel.status" size="mini" filterable placeholder="请选择" clearable>
-            <el-option
-                  v-for="result in statusList"
-                  :key="result.id"
-                  :label="result.name"
-                  :value="result.value"
-                ></el-option>
-            </el-select>
-        </el-form-item>
-        <el-form-item label="是否置顶" prop="isTopping">
-          <el-select v-model="queryModel.isTopping" size="mini" filterable placeholder="请选择" clearable>
-            <el-option
-                  v-for="result in isToppingList"
-                  :key="result.id"
-                  :label="result.name"
-                  :value="result.value"
-                ></el-option>
-            </el-select>
-        </el-form-item>
-        <el-form-item label="是否上架" prop="isOnline">
-          <el-select v-model="queryModel.isOnline" size="mini" filterable placeholder="请选择" clearable>
-            <el-option
-                  v-for="result in isOnlineList"
-                  :key="result.id"
-                  :label="result.name"
-                  :value="result.value"
-                ></el-option>
-            </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button
-            type="primary"
-            size="mini"
-            icon="ios-search"
-            @click="changePage(1)"
-            :loading="loading"
-          >查询</el-button>&nbsp;
-          <el-button
-            type="info"
-            size="mini"
-            style="margin-left: 8px"
-            @click="handleReset('queryForm')"
-          >重置</el-button>&nbsp;
-        </el-form-item>
-      </el-form>
-      <el-divider></el-divider>
-      <el-row class="button-group">
-        <el-button type="primary" size="small" plain icon="el-icon-circle-plus" @click="handleAdd">新增</el-button>
-        <el-button
-          type="primary"
-          size="small"
-          plain
-          icon="el-icon-remove"
-          :disabled="multipleSelection.length==0"
-          @click="handleBatchDelete"
-        >删除选中项</el-button>
-        <el-button
-          type="primary"
-          size="small"
-          plain
-          icon="el-icon-upload"
-          @click="batchImportVisible = true"
-        >导入</el-button>
-        <el-button
-          type="primary"
-          size="small"
-          plain
-          icon="el-icon-upload2"
-          @click="exportXls"
-        >导出数据</el-button>
-      </el-row>
-      <el-table
-        :data="tableData"
-        v-loading="loading"
-        stripe
-        @sort-change="sortChange"
-        @selection-change="handleSelectionChange"
-        :key="timeStamp"
-      >
-        <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column  prop="enterpriseName"  label="企业名称" width="200">
-            <template slot-scope="{row}">
-                <span>{{row.enterpriseName}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column  prop="industryN"  label="行业"></el-table-column>
-        <el-table-column  prop="positionName"  label="职位名称" width="180"></el-table-column>
-        <el-table-column  prop="salary"  label="薪资待遇"></el-table-column>
-        <el-table-column  prop="settlementMethodN"  label="结算方式"></el-table-column>
-        <el-table-column  prop="ageRequirement"  label="年龄要求"></el-table-column>
-        <el-table-column  prop="recruitingNumbers"  label="招聘人数"></el-table-column>
-        <el-table-column  prop="contacts"  label="联系人"></el-table-column>
-        <el-table-column  prop="contactsPhone"  label="联系电话" width="120"></el-table-column>
-        <el-table-column  prop="workArea"  label="工作地区"></el-table-column>
-        <el-table-column  prop="address"  label="详细地址" width="200"></el-table-column>
-        <el-table-column  prop="browseNumber"  label="浏览次数"></el-table-column>
-        <el-table-column  prop="status"  label="审核状态">
-          <template slot-scope="{row}">
-            <span v-if="row.status=='0'" style="color: #F56C6C;">未审核</span>
-            <span v-else-if="row.status=='1'" style="color: #67C23A;">已审核</span>
-          </template>
-        </el-table-column>
-        <el-table-column  prop="isTopping"  label="是否置顶">
-          <template slot-scope="{row}">
-            <span v-if="row.isTopping">
-              已置顶
-            </span>
-          </template>
-        </el-table-column>
-        <el-table-column  prop="isOnline"  label="是否上架">
-          <template slot-scope="{row}">
-            <span v-if="row.isOnline">
-              <el-link type="success" @click="handleChangeIsOnline(row)">上架</el-link>
-            </span>
-            <span v-else>
-              <el-link type="info"  @click="handleChangeIsOnline(row)">下架</el-link>
-            </span>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作"  fixed="right"  width="450">
-          <template slot-scope="{row}">
-            <el-button class="btu1" size="mini" type="warning" @click="handleEdit(row)">编辑</el-button>
-            <el-button class="btu1" v-if="row.status=='0'" size="mini" type="primary" @click="handleCheck(row)">审核</el-button>
-            <el-button class="btu1" size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
-            <el-button class="btu1" v-if="row.isTopping" size="mini" type="info" @click="handleTopping(row)">不置顶</el-button>
-            <el-button class="btu1" v-else size="mini" type="info" @click="handleTopping(row)">置顶</el-button>
-            <el-badge v-if="row.isReadNumber!=0" :value="row.isReadNumber" class="item">
-              <el-button size="mini" type="success" @click="handleRelation(row)">收到报名</el-button>
-            </el-badge>
-            <el-button v-else size="mini" type="success" @click="handleRelation(row)">收到报名</el-button>
-
-
-            <!-- <el-link type="warning" @click="handleEdit(row)">编辑-</el-link>
-            <el-link type="primary" v-if="row.status=='0'" @click="handleCheck(row)">审核-</el-link>
-            <el-link type="danger"  @click="handleDelete(row)">删除-</el-link>
-            <el-badg v-if="row.isReadNumber!=0" :value="row.isReadNumber">
-              <el-link type="success" @click="handleRelation(row)">收到报名</el-link>
-            </el-badg>
-            <el-link v-else type="success" @click="handleRelation(row)">收到报名</el-link> -->
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-        :current-page.sync="pageIndex"
-        :total="totalElements"
-        :page-sizes="pageSizeList"
-        @current-change="changePage"
-        @size-change="pageSizeChange"
-        layout="total, sizes, prev, pager, next, jumper"
-      ></el-pagination>
-      <enterpriseInfo-detail
-        v-if="showModal"
-        ref="userDetail"
-        :businessKey="businessKey"
-        :title="modalTitle"
-        @close="onDetailModalClose"
-      ></enterpriseInfo-detail>
-      <recruitPersonRelation-list
-        v-if="showModal2"
-        :businessKey="businessKey"
-        :title="modalTitle2"
-        @close="onDetailModalClose2"
-      ></recruitPersonRelation-list>
-      <recruitInformationInfo-detail
-        v-if="showModal3"
-        :businessKey="businessKey"
-        :title="modalTitle3"
-        @close="onDetailModalClose3"
-      ></recruitInformationInfo-detail>
-      <el-dialog
-      title="批量导入企业"
-      :visible.sync="batchImportVisible"
-      :modal-append-to-body="false"
-      style="text-align: left"
-      :close-on-click-modal="false"
-    >
-      <el-form label-width="150px">
-        <el-form-item label="模板下载">
-          <el-link
-            href="https://oss.xiaoxinda.com/jk-temporary-workers/recruitInformationInfo.xls"
-            type="primary"
-            target="_blank"
-            >点击下载模板</el-link
-          >
-        </el-form-item>
-        <el-form-item label="上传文件">
-          <el-upload
-            class="upload-demo"
-            accept=".xls"
-            :action="uploadUrlXls"
-            :data="uploadXlsData"
-            :headers="headers"
-            :on-preview="handleBatchImportPreview"
-            name="uploadFile"
-            :multiple="true"
-            :limit="1"
-            :on-remove="handleBatchImportRemove"
-            :before-remove="beforeBatchImportRemove"
-            :before-upload="beforeUpload"
-            :on-exceed="handleBatchImportExceed"
-            :on-success="handleBatchImportSuccess"
-            :file-list="batchImportFileList"
-          >
-            <el-button size="small" type="primary" :loading="xlsLoading"
-              >点击上传</el-button
-            >
-            <div slot="tip" class="el-upload__tip">
-              只能上传xls文件,且不超过500kb
-            </div>
-          </el-upload>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="batchImportVisible = false"
-          >关 闭</el-button
-        >
-      </div>
-    </el-dialog>
-    </div>
-  </template>
-  <script>
-  import Constant from "@/constant";
-  import recruitInformationInfoApi from "@/api/base/recruitInformationInfo";
-  import enterpriseInfoDetail from "./enterpriseInfo-detail";
-  import recruitPersonRelationList from "./recruitPersonRelation-list";
-  import recruitInformationInfoDetail from "./recruitInformationInfo-detail";
-  import dataDictionaryApi from "@/api/sys/dataDictionary";
-  import { getToken } from "@/utils/auth"; // get token from cookie
-
-  export default {
-    name: 'baseRecruitInformationInfoList',
-    data() {
-      var self = this;
-  
-      return {
-        queryModel: {
-          name: "",
-          positionName:"",
-          intendedIndustries:"",
-          method:"",
-          status:"",
-          workArea:"",
-          isOnline:"",
-          isTopping:"",
-        },
-        loading: false,
-        tableData: [],
-        pageIndex: 1,
-        pageSize: 10,
-        totalPages: 0,
-        totalElements: 0,
-        field: "",
-        direction: "",
-        pageSizeList: [10, 20, 30],
-        multipleSelection: [],
-        modalTitle: "",
-        modalTitle2: "",   
-        modalTitle3: "",      
-        businessKey: "",
-        showModal: false,
-        showModal2:false,
-        showModal3:false,
-        dialogFormVisible:false,
-        newPassword:"",
-        intendedIndustriesList:[],
-        methodList:[],
-        statusList:[
-          {
-            "id":"0",
-            "name":"未审核",
-            "value":"0"
-          },
-          {
-            "id":"1",
-            "name":"已审核",
-            "value":"1"
-          }
-        ],
-        props: {
-          // 配置项(必选)
-          value: "id",
-          label: "name",
-          children: "children"
-        },
-        batchImportVisible: false,
-        xlsLoading: false,
-        batchImportFileList: [],
-        uploadUrlXls: Constant.serverUrl + "/base/recruitInformationInfo/importXls",
-        uploadXlsData: {
-            subFolder: "recruitInformationInfo",
-        },
-        headers: {
-            Authorization: getToken(),
-        },
-        timeStamp:"",
-        isToppingList:[
-          {
-            "id":"0",
-            "name":"未置顶",
-            "value":"0"
-          },
-          {
-            "id":"1",
-            "name":"已置顶",
-            "value":"1"
-          }
-        ],
-        isOnlineList:[
-          {
-            "id":"0",
-            "name":"下架",
-            "value":"0"
-          },
-          {
-            "id":"1",
-            "name":"上架",
-            "value":"1"
-          }
-        ]
-      };
-    },
-    created() {
-        dataDictionaryApi.findByCatalogName({catalogName: "意向行业",})
-        .then((response) => {
-            var jsonData = response.data;
-            this.intendedIndustriesList = jsonData.data;
-        });
-
-        dataDictionaryApi.findByCatalogName({catalogName: "结算方式",})
-        .then((response) => {
-            var jsonData = response.data;
-            this.methodList = jsonData.data;
-        });
-    },
-    methods: {
-      changePage(pageIndex,exportFlag) {
-        var self = this;
-  
-        console.log(pageIndex);
-  
-        self.pageIndex = pageIndex;
-        var formData = new FormData();
-  
-        formData.append("pageIndex", self.pageIndex);
-        if(exportFlag!=null){
-            formData.append("exportFlag", exportFlag);
-            formData.append("pageSize", 10000);
-        }
-        else{
-            formData.append("pageSize", self.pageSize);
-        }
-  
-        formData.append("name", self.queryModel.name);
-        formData.append("positionName", self.queryModel.positionName);
-        formData.append("intendedIndustries", self.queryModel.intendedIndustries);
-        formData.append("method", self.queryModel.method);
-        formData.append("status", self.queryModel.status);
-        formData.append("workArea", self.queryModel.workArea);
-        formData.append("isOnline", self.queryModel.isOnline);
-        formData.append("isTopping", self.queryModel.isTopping);
-        
-  
-        self.loading = true;
-  
-        recruitInformationInfoApi.pageList(formData).then(function(response) {
-          self.loading = false;
-            var jsonData = response.data;
-            if(jsonData.result) {
-                if(exportFlag){
-                    //导出
-                    self.$message({
-                        showClose: true,
-                        type: "success",
-                        message: `报表已生成,<a href="${jsonData.data}">请点击链接下载</a>`,
-                        dangerouslyUseHTMLString: true,
-                        duration: 30000
-                    });
-                }
-                else{
-                    //分页查看
-                    var page = jsonData.data;
-
-                    self.tableData = page.data;
-                    self.totalPages = page.totalPages;
-                    self.totalElements = page.recordsTotal;
-                }
-            }
-            else{
-                self.$message.warning(jsonData.message);
-            }
-        }).catch((error)=>{
-          self.loading = false;
-        });
-      },
-      pageSizeChange(pageSize) {
-        this.pageSize = pageSize;
-      },
-      sortChange(data) {
-        this.field = data.column.field;
-        this.direction = data.order == "ascending" ? "asc" : "desc";
-  
-        this.changePage(this.pageIndex);
-      },
-      handleSelectionChange(val) {
-        this.multipleSelection = val;
-      },
-      handleReset(name) {
-        this.$refs[name].resetFields();
-      },
-      handleAdd() {
-        var self = this;
-        
-        self.modalTitle3 = "新增招聘信息";
-        self.businessKey = "";
-        self.showModal3 = true;
-      },
-      handleEdit(record) {
-        var self = this;
-        
-        self.modalTitle3 = "编辑招聘信息";
-        self.businessKey = record.id;
-        self.showModal3 = true;
-      },
-      handleRelation(record) {
-        var self = this;
-        self.modalTitle2 = "收到报名列表";
-        self.businessKey = record.id;
-        self.showModal2 = true;
-      },
-      handleCheck(record){
-        var self = this;
-  
-        this.$confirm("是否确认审核?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-            recruitInformationInfoApi.check(record.id).then(function(response) {
-            var jsonData = response.data;
-
-            if (jsonData.result) {
-              // var index = self.tableData.indexOf(record);
-              // self.tableData.splice(index, 1);
-              self.changePage(self.pageIndex);
-
-              self.$message({
-                type: "success",
-                message: "审核成功!"
-              });
-            }
-          });
-        });
-      },
-      handleChangeIsOnline(record){
-        var self = this;
-
-        recruitInformationInfoApi.changeIsOnline(record.id).then(function(response) {
-          var jsonData = response.data;
-
-          if (jsonData.result) {
-            self.changePage(self.pageIndex);
-
-            self.$message({
-              type: "success",
-              message: "修改成功!"
-            });
-          }
-        });
-
-      },
-      handleTopping(record){
-        var self = this;
-
-        recruitInformationInfoApi.changeTopping(record.id).then(function(response) {
-          var jsonData = response.data;
-
-          if (jsonData.result) {
-            self.changePage(self.pageIndex);
-
-            self.$message({
-              type: "success",
-              message: "置顶成功!"
-            });
-          }
-        });
-      },
-      handleDelete(record) {
-        var self = this;
-  
-        this.$confirm("是否确认删除?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-            recruitInformationInfoApi.remove(record.id).then(function(response) {
-            var jsonData = response.data;
-  
-            if (jsonData.result) {
-              // var index = self.tableData.indexOf(record);
-              // self.tableData.splice(index, 1);
-              self.changePage(self.pageIndex);
-  
-              self.$message({
-                type: "success",
-                message: "删除成功!"
-              });
-            }
-          });
-        });
-      },
-      handleBatchDelete() {
-        var self = this;
-  
-        var idList = this.multipleSelection.map(record => {
-          return record.id;
-        });
-  
-        this.$confirm("是否确认删除选中项?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-            recruitInformationInfoApi.batchRemove(idList).then(function(response) {
-            var jsonData = response.data;
-  
-            if (jsonData.result) {
-              self.changePage(self.pageIndex);
-  
-              self.$message({
-                type: "success",
-                message: "删除成功!"
-              });
-            }
-          });
-        });
-      },
-      exportXls() {
-        this.changePage(1,true);
-      },
-      onDetailModalClose(refreshed) {
-        this.showModal = false;
-  
-        if(refreshed) {
-          this.changePage(this.pageIndex);
-        }
-      },
-      onDetailModalClose2(refreshed,status) {
-        this.showModal2 = false;
-  
-        if(refreshed||status) {
-          this.changePage(this.pageIndex);
-        }
-      },
-      onDetailModalClose3(refreshed) {
-        this.showModal3 = false;
-  
-        if(refreshed) {
-          this.changePage(this.pageIndex);
-        }
-      },
-      beforeUpload(file, fileList) {
-          //导入前判断
-          var self = this;
-          self.xlsLoading = true;
-          return true;
-      },
-              //批量导入-上传成功
-              handleBatchImportSuccess(response, file, fileList) {
-        var self = this;
-        self.xlsLoading = false;
-
-        if (response.result) {
-            self.$message.success(response.message);
-            this.batchImportFileList = [];
-            this.changePage(1);
-
-
-        } else {
-            //this.$message.error(response.message);
-            this.batchImportFileList = [];
-            this.changePage(1);
-
-            if (response.data != null) {
-            //下载有错误信息提示的报表
-            //window.open(response.data);
-            self.$message({
-                showClose: true,
-                dangerouslyUseHTMLString: true,
-                message:
-                response.message +
-                `,<a href="${response.data}" target="_blank">点击下载未导入的数据报表</a>&nbsp;`,
-                duration: 30000,
-            });
-            }
-        }
-
-        this.batchImportVisible = false;
-      },
-      //批量导入-预览
-      handleBatchImportPreview(file) {
-        console.log(file.url);
-      },
-      //批量导入-移除
-      handleBatchImportRemove(file, fileList) {
-        console.log(file, fileList);
-      },
-      //批量导入-移除前操作
-      beforeBatchImportRemove(file, fileList) {
-        console.log(file, fileList);
-      },
-      //批量导入-文件超出个数限制时的钩子
-      handleBatchImportExceed(files, fileList) {
-      this.$message.warning(
-          `当前限制选择 3 个文件,本次选择了 ${files.length} 个文件,共选择了 ${
-          files.length + fileList.length
-          } 个文件`
-        );
-      },
-    },
-    mounted: function() {
-      var self = this;
-      this.changePage(1);
-    },
-    components: {
-      "enterpriseInfo-detail":enterpriseInfoDetail,
-      "recruitPersonRelation-list":recruitPersonRelationList,
-      "recruitInformationInfo-detail":recruitInformationInfoDetail
-    }
-  };
-  </script>
-  <style lang="scss" scoped>
-  .el-breadcrumb {
-    margin: 10px;
-    line-height: 20px;
-  }
-  
-  .el-divider {
-    margin: 5px 0;
-  }
-  
-  .demo-form-inline {
-    margin-left: 10px;
-    text-align: left;
-  }
-  
-  .button-group {
-    padding: 10px;
-    text-align: left;
-  }
-  .item{
-    margin-left: 10px;
-  }
-.btu1{
-  margin-top: 10px;
-  margin-right: 15px;
-}
-  </style>

+ 0 - 156
src/views/base/recruitPersonRelation-detail.vue

@@ -1,156 +0,0 @@
-
-<template>
-    <el-dialog
-      :visible.sync="showDialog"
-      :title="title"
-      :modal-append-to-body="true"
-      style="text-align: left;"
-      @close="closeDialog"
-      :close-on-click-modal="false"
-      :append-to-body="true"
-      width="900px"
-    >
-      <div class="user-panel" v-loading="loading">
-        <el-descriptions title="详细信息">
-            <el-descriptions-item label="姓名"><span class="colorText">{{formModel.personName}}</span></el-descriptions-item>
-            <el-descriptions-item label="手机号"><span class="colorText">{{formModel.personPhone}}</span></el-descriptions-item>
-            <el-descriptions-item label="居住地"><span class="colorText">{{formModel.address}}</span></el-descriptions-item>
-            <el-descriptions-item label="服务描述"><span class="colorText">{{formModel.serviceDesc}}</span></el-descriptions-item>
-            <el-descriptions-item label="意向行业"><span class="colorText">{{formModel.intendedIndustriesN}}</span></el-descriptions-item>
-            <el-descriptions-item label="意向岗位"><span class="colorText">{{formModel.intendedPosition}}</span></el-descriptions-item>
-            <el-descriptions-item label="期望薪资"><span class="colorText">{{formModel.hopeSalary}}</span></el-descriptions-item>
-            <el-descriptions-item label="结算方式"><span class="colorText">{{formModel.methodN}}</span></el-descriptions-item>
-            <el-descriptions-item label="工作经验"><span class="colorText">{{formModel.workExperienceN}}</span></el-descriptions-item>
-            <el-descriptions-item label="最高学历"><span class="colorText">{{formModel.educationN}}</span></el-descriptions-item>
-        </el-descriptions>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="closeDialog">关 闭</el-button>
-      </span>
-    </el-dialog>
-  </template>
-  <script>
-  import recruitPersonRelationApi from "@/api/base/recruitPersonRelation";
-  import dataDictionaryApi from "@/api/sys/dataDictionary";
-  
-  export default {
-    props: ["relationId", "title"],
-    data() {
-      return {
-          showPwd: true,
-          ruleValidate: {
-              title: [
-              { required: true, message: "标题不能为空", trigger: "blur" },
-              ],
-              author: [
-              { required: true, message: "作者不能为空", trigger: "blur" },
-              ],
-              type: [
-              { required: true, message: "类型不能为空", trigger: "blur" },
-              ],
-          },
-          roleList: [],
-          formModel: {},
-          showDialog: true,
-          loading: false,
-          submitting: false,
-          companyProps: {
-              value: "id",
-              label: "name",
-          },
-          typeList:[],
-          isStatus:false,
-      };
-    },
-    created() {
-        dataDictionaryApi.findByCatalogName({catalogName: "共享用工类型",})
-        .then((response) => {
-            var jsonData = response.data;
-            this.typeList = jsonData.data;
-        });
-    },
-    methods: {
-      closeDialog() {
-        this.$emit("close", false,this.isStatus);
-      },
-      handleSubmit() {
-        var self = this;
-  
-        this.$refs["form"].validate((valid) => {
-          if (valid) {
-            (function () {
-              var id = self.formModel.id;
-  
-              if (id == null || id.length == 0) {
-                return recruitPersonRelationApi.add(self.formModel);
-              } else {
-                return recruitPersonRelationApi.update(self.formModel);
-              }
-            })().then(function (response) {
-              var jsonData = response.data;
-  
-              if (jsonData.result) {
-                self.$message({
-                  message: "保存成功!",
-                  type: "success",
-                });
-  
-                self.$emit("close", true);
-              } else {
-                self.$message({
-                  message: jsonData.message + "",
-                  type: "warning",
-                });
-  
-                self.$emit("close", false);
-              }
-            });
-          }
-        });
-      },
-    },
-    async mounted() {
-      var self = this;
-      self.loading = true;
-  
-      (function () {
-          return recruitPersonRelationApi.jobInformationDetail(self.relationId);
-      })()
-        .then((response) => {
-          var jsonData = response.data;
-  
-          if (jsonData.result) {
-            self.formModel = jsonData.data;
-
-            if (self.formModel.content != null) {
-                self.$refs.editor.setContent(self.formModel.content);
-            }
-
-            if(self.formModel.isReadStatus){
-              self.isStatus = true;
-            }
-
-            self.showModal = true;
-          } else {
-            self.$message.error(jsonData.message + "");
-          }
-  
-          self.loading = false;
-        })
-        .catch((error) => {
-          self.$message.error(error + "");
-          self.loading = false;
-        });
-    },
-    components: {
-    },
-  };
-  </script>
-  <style scoped>
-  .user-panel {
-    margin: 10px auto;
-  }
-  .colorText{
-    font-weight: bold;
-  }
-  </style>

+ 0 - 207
src/views/base/recruitPersonRelation-list.vue

@@ -1,207 +0,0 @@
-
-<template>
-    <el-dialog
-      :visible.sync="showDialog"
-      :title="title"
-      :modal-append-to-body="true"
-      style="text-align: left;"
-      @close="closeDialog"
-      :close-on-click-modal="false"
-      :append-to-body="true"
-      width="1000px"
-    >
-      <div class="user-panel" v-loading="loading">
-        <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
-            <el-form-item label="姓名" prop="name">
-                <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
-            </el-form-item>
-            <el-form-item label="联系电话" prop="phone">
-                <el-input type="text" size="mini" v-model="queryModel.phone"></el-input>
-            </el-form-item>
-            <el-form-item>
-            <el-button
-                type="primary"
-                size="mini"
-                icon="ios-search"
-                @click="changePage(1)"
-                :loading="loading"
-            >查询</el-button>&nbsp;
-            <el-button
-                type="info"
-                size="mini"
-                style="margin-left: 8px"
-                @click="handleReset('queryForm')"
-            >重置</el-button>&nbsp;
-            </el-form-item>
-        </el-form>
-        <el-divider></el-divider>
-        <el-table
-        :data="tableData"
-        style="min-height:400px;"
-        v-loading="loading"
-        stripe
-        @sort-change="sortChange"
-        @selection-change="handleSelectionChange"
-         :key="timeStamp"
-      >
-            <!-- <el-table-column type="selection" width="55"></el-table-column> -->
-            <el-table-column  prop="workPersonName"  label="姓名"></el-table-column>
-            <el-table-column  prop="phone"  label="联系电话"></el-table-column>
-            <el-table-column  prop="gender"  label="性别">
-                <template slot-scope="{row}">
-                    <span v-if="row.gender=='0'">男</span>
-                    <span v-else-if="row.gender=='1'">女</span>
-                </template>
-            </el-table-column>
-            <el-table-column  prop="age"  label="年龄"></el-table-column>
-            <el-table-column  prop="createTime"  label="报名时间" width="180"></el-table-column>
-
-            <el-table-column label="查看">
-            <template slot-scope="{row}">
-                <el-link v-if="row.isRead" type="info" @click="handleDetail(row)">查看简历</el-link>
-                <el-link v-else type="primary" @click="handleDetail(row)">查看简历</el-link>
-            </template>
-            </el-table-column>
-        </el-table>
-        <el-pagination
-            style="text-align: center;"
-            :current-page.sync="pageIndex"
-            :total="totalElements"
-            :page-sizes="pageSizeList"
-            @current-change="changePage"
-            @size-change="pageSizeChange"
-            layout="total, sizes, prev, pager, next, jumper"
-        ></el-pagination>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="closeDialog">取 消</el-button>
-      </span>
-      <recruitPersonRelation-detail
-        v-if="showModal"
-        :relationId="relationId"
-        :title="modalTitle"
-        @close="onDetailModalClose"
-      ></recruitPersonRelation-detail>
-    </el-dialog>
-  </template>
-  <script>
-  import recruitPersonRelationApi from "@/api/base/recruitPersonRelation";
-  import recruitPersonRelationDetail from "./recruitPersonRelation-detail";
-  
-  export default {
-    props: ["businessKey", "title"],
-    data() {
-      return {
-            submitting: false,
-            queryModel: {
-                name:"",
-                phone:"",
-            },
-            showDialog: true,
-            loading: false,
-            tableData: [],
-            pageIndex: 1,
-            pageSize: 10,
-            totalPages: 0,
-            totalElements: 0,
-            field: "",
-            direction: "",
-            pageSizeList: [10, 20, 30],
-            multipleSelection: [],
-            showModal: false,
-            timeStamp:"",
-            isStatus:false,
-      };
-    },
-    created() {
-
-    },
-    methods: {
-      closeDialog() {
-        this.$emit("close", false,this.isStatus);
-      },
-      changePage(pageIndex) {
-        var self = this;
-  
-        console.log(pageIndex);
-  
-        self.pageIndex = pageIndex;
-        var formData = new FormData();
-  
-        formData.append("pageIndex", self.pageIndex);
-        formData.append("pageSize", self.pageSize);
-  
-        formData.append("informationId", self.businessKey);
-        formData.append("name", self.queryModel.name);
-        formData.append("phone", self.queryModel.phone);
-  
-        self.loading = true;
-  
-        recruitPersonRelationApi.pageList(formData).then(function(response) {
-          self.loading = false;
-  
-          var jsonData = response.data;
-  
-          if(jsonData.result){
-            var pageInfo = jsonData.data;
-  
-            self.tableData = pageInfo.data;
-            self.totalPages = pageInfo.totalPages;
-            self.totalElements = pageInfo.recordsTotal;
-          }
-          else {
-            self.$message({
-                message: jsonData.message + "",
-                type: "warning"
-              });
-          }
-        }).catch((error)=>{
-          self.loading = false;
-        });
-      },
-      handleDetail(record){
-        var self = this;
-
-        self.modalTitle = "查看简历";
-        self.relationId = record.id;
-        self.showModal = true;
-      },
-      onDetailModalClose(refreshed,status) {
-        this.showModal = false;
-        if(status){
-          this.isStatus = true;
-        }
-        if(refreshed||status) {
-          this.changePage(this.pageIndex);
-        }
-      },
-      handleReset(name) {
-        this.$refs[name].resetFields();
-      },
-      pageSizeChange(pageSize) {
-        this.pageSize = pageSize;
-      },
-      sortChange(data) {
-        this.field = data.column.field;
-        this.direction = data.order == "ascending" ? "asc" : "desc";
-  
-        this.changePage(this.pageIndex);
-      },
-      handleSelectionChange(val) {
-        this.multipleSelection = val;
-      },
-    },
-    async mounted() {
-      var self = this;
-      self.changePage(1);
-    },
-    components: {
-      "recruitPersonRelation-detail":recruitPersonRelationDetail
-    },
-  };
-  </script>
-  <style scoped>
-  .user-panel {
-    margin: 10px auto;
-  }
-  </style>

+ 0 - 218
src/views/base/shareWorksInfo-detail.vue

@@ -1,218 +0,0 @@
-
-<template>
-    <el-dialog
-      :visible.sync="showDialog"
-      :title="title"
-      :modal-append-to-body="false"
-      style="text-align: left;"
-      @close="closeDialog"
-      :close-on-click-modal="false"
-      width="900px"
-    >
-      <div class="user-panel" v-loading="loading">
-        <el-form
-          ref="form"
-          :model="formModel"
-          :rules="ruleValidate"
-          :label-width="'100px'"
-        >
-          <el-form-item label="标题" prop="title">
-            <el-input v-model="formModel.title" placeholder="请输入标题" style="width: 300px"></el-input>
-          </el-form-item>
-          <el-form-item label="作者" prop="author">
-            <el-input v-model="formModel.author" placeholder="请输入作者" style="width: 300px"></el-input>
-          </el-form-item>
-          <el-form-item label="类型" prop="type">
-            <el-select v-model="formModel.type" filterable placeholder="请选择" clearable style="width:300px;">
-              <el-option
-                    v-for="result in typeList"
-                    :key="result.id"
-                    :label="result.name"
-                    :value="result.value"
-                  ></el-option>
-              </el-select>
-          </el-form-item>
-          <el-form-item label="内容" prop="content">
-            <mce-editor
-                ref="editor"
-                uploadName="upfile"
-                v-model="formModel.content"
-                :url="uploadUrl1"
-                :config="editorConfig"
-                style="width: 90%"
-            ></mce-editor>
-        </el-form-item>
-  
-        </el-form>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="closeDialog">取 消</el-button>
-        <el-button type="primary" @click="handleSubmit" :loading="submitting"
-          >确 定</el-button
-        >
-      </span>
-    </el-dialog>
-  </template>
-  <script>
-  import Constant from "@/constant";
-  import { getToken } from "@/utils/auth"; // get token from cookie
-  import shareWorksInfoApi from "@/api/base/shareWorksInfo";
-  import MceEditor from "@/components/Tinymce";
-  import dataDictionaryApi from "@/api/sys/dataDictionary";
-  
-  export default {
-    props: ["businessKey", "title"],
-    data() {
-      return {
-          showPwd: true,
-          ruleValidate: {
-              title: [
-              { required: true, message: "标题不能为空", trigger: "blur" },
-              ],
-              author: [
-              { required: true, message: "作者不能为空", trigger: "blur" },
-              ],
-              type: [
-              { required: true, message: "类型不能为空", trigger: "blur" },
-              ],
-          },
-          roleList: [],
-          formModel: {},
-          showDialog: true,
-          loading: false,
-          submitting: false,
-          companyProps: {
-              value: "id",
-              label: "name",
-          },
-          typeList:[],
-          //上传地址
-          uploadUrl: Constant.serverUrl + "/uploadPicture",
-          uploadData: {
-              subFolder: "temporary-workers",
-          },
-          fileUrl: "",
-          headers: {
-              Authorization: getToken(),
-          },
-          uploadUrl1: Constant.serverUrl + "/tinymce/upload?token=" + getToken(),
-          editorConfig: {
-            height: 300,
-            width: 660,
-          },
-      };
-    },
-    created() {
-        dataDictionaryApi.findByCatalogName({catalogName: "共享用工类型",})
-        .then((response) => {
-            var jsonData = response.data;
-            this.typeList = jsonData.data;
-        });
-    },
-    methods: {
-      closeDialog() {
-        this.$emit("close", false);
-      },
-      handleSubmit() {
-        var self = this;
-  
-        this.$refs["form"].validate((valid) => {
-          if (valid) {
-            (function () {
-              var id = self.formModel.id;
-  
-              if (id == null || id.length == 0) {
-                return shareWorksInfoApi.add(self.formModel);
-              } else {
-                return shareWorksInfoApi.update(self.formModel);
-              }
-            })().then(function (response) {
-              var jsonData = response.data;
-  
-              if (jsonData.result) {
-                self.$message({
-                  message: "保存成功!",
-                  type: "success",
-                });
-  
-                self.$emit("close", true);
-              } else {
-                self.$message({
-                  message: jsonData.message + "",
-                  type: "warning",
-                });
-  
-                self.$emit("close", false);
-              }
-            });
-          }
-        });
-      },
-    },
-    async mounted() {
-      var self = this;
-      self.loading = true;
-  
-      (function () {
-        if (self.businessKey != null && self.businessKey.length > 0) {
-          return shareWorksInfoApi.edit(self.businessKey);
-        } else {
-          return shareWorksInfoApi.create();
-        }
-      })()
-        .then((response) => {
-          var jsonData = response.data;
-  
-          if (jsonData.result) {
-            self.formModel = jsonData.data;
-
-            if (self.formModel.content != null) {
-                self.$refs.editor.setContent(self.formModel.content);
-            }
-
-            self.showModal = true;
-          } else {
-            self.$message.error(jsonData.message + "");
-          }
-  
-          self.loading = false;
-        })
-        .catch((error) => {
-          self.$message.error(error + "");
-          self.loading = false;
-        });
-    },
-    components: {
-        "mce-editor": MceEditor,
-    },
-  };
-  </script>
-  <style scoped>
-  .user-panel {
-    margin: 10px auto;
-  }
-  
-  .avatar-uploader .el-upload {
-      border: 1px dashed #d9d9d9;
-      border-radius: 6px;
-      cursor: pointer;
-      position: relative;
-      overflow: hidden;
-    }
-    .avatar-uploader .el-upload:hover {
-      border-color: #409EFF;
-    }
-    .avatar-uploader-icon {
-      font-size: 28px;
-      color: #8c939d;
-      width: 178px;
-      height: 178px;
-      line-height: 178px;
-      text-align: center;
-    }
-    .avatar {
-      width: 178px;
-      height: 178px;
-      display: block;
-    }
-  </style>

+ 0 - 308
src/views/base/shareWorksInfo-list.vue

@@ -1,308 +0,0 @@
-<template>
-    <div>
-      <el-breadcrumb separator=">">
-        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-        <el-breadcrumb-item>
-          <a href="#">基础信息管理</a>
-        </el-breadcrumb-item>
-        <el-breadcrumb-item>
-          共享用工信息
-        </el-breadcrumb-item>
-      </el-breadcrumb>
-      <el-divider></el-divider>
-      <!--
-        要resetFields起作用,必须配置:model和prop
-      -->
-      <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
-        <el-form-item label="标题" prop="title">
-          <el-input type="text" size="mini" v-model="queryModel.title"></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button
-            type="primary"
-            size="mini"
-            icon="ios-search"
-            @click="changePage(1)"
-            :loading="loading"
-          >查询</el-button>&nbsp;
-          <el-button
-            type="info"
-            size="mini"
-            style="margin-left: 8px"
-            @click="handleReset('queryForm')"
-          >重置</el-button>&nbsp;
-        </el-form-item>
-      </el-form>
-      <el-divider></el-divider>
-      <el-row class="button-group">
-        <el-button type="primary" size="small" plain icon="el-icon-circle-plus" @click="handleAdd">新增</el-button>
-        <el-button
-          type="primary"
-          size="small"
-          plain
-          icon="el-icon-remove"
-          :disabled="multipleSelection.length==0"
-          @click="handleBatchDelete"
-        >删除选中项</el-button>
-      </el-row>
-      <el-table
-        :data="tableData"
-        style="min-height:400px;"
-        v-loading="loading"
-        stripe
-        @sort-change="sortChange"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column  prop="title"  label="标题">
-        </el-table-column>
-        <el-table-column  prop="typeN"  label="类型"></el-table-column>
-        <el-table-column  prop="author"  label="作者"></el-table-column>
-        <el-table-column  prop="createTime"  label="创建时间"></el-table-column>
-        <el-table-column  prop="status"  label="审核状态">
-          <template slot-scope="{row}">
-            <span v-if="row.status=='0'" style="color: #F56C6C;">未审核</span>
-            <span v-else-if="row.status=='1'" style="color: #67C23A;">已审核</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" width="250">
-          <template slot-scope="{row}">
-            <el-button size="mini" type="warning" @click="handleEdit(row)">编辑</el-button>
-            <el-button v-if="row.status=='0'" size="mini" type="primary" @click="handleCheck(row)">审核</el-button>
-            <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-        :current-page.sync="pageIndex"
-        :total="totalElements"
-        :page-sizes="pageSizeList"
-        @current-change="changePage"
-        @size-change="pageSizeChange"
-        layout="total, sizes, prev, pager, next, jumper"
-      ></el-pagination>
-      <shareWorksInfo-detail
-        v-if="showModal"
-        ref="userDetail"
-        :businessKey="businessKey"
-        :title="modalTitle"
-        @close="onDetailModalClose"
-      ></shareWorksInfo-detail>
-    </div>
-  </template>
-  <script>
-  import shareWorksInfoApi from "@/api/base/shareWorksInfo";
-  import shareWorksInfoDetail from "./shareWorksInfo-detail";
-  
-  export default {
-    name: 'baseRecruitInformationInfoList',
-    data() {
-      var self = this;
-  
-      return {
-        queryModel: {
-          title: "",
-        },
-        loading: false,
-        tableData: [],
-        pageIndex: 1,
-        pageSize: 10,
-        totalPages: 0,
-        totalElements: 0,
-        field: "",
-        direction: "",
-        pageSizeList: [10, 20, 30],
-        multipleSelection: [],
-        modalTitle: "",      
-        businessKey: "",
-        showModal: false,
-        dialogFormVisible:false,
-        newPassword:"",
-        roleResult:[],
-        props: {
-          // 配置项(必选)
-          value: "id",
-          label: "name",
-          children: "children"
-        },
-      };
-    },
-    methods: {
-      changePage(pageIndex) {
-        var self = this;
-  
-        console.log(pageIndex);
-  
-        self.pageIndex = pageIndex;
-        var formData = new FormData();
-  
-        formData.append("pageIndex", self.pageIndex);
-        formData.append("pageSize", self.pageSize);
-  
-        formData.append("title", self.queryModel.title);
-        
-  
-        self.loading = true;
-  
-        shareWorksInfoApi.pageList(formData).then(function(response) {
-          self.loading = false;
-  
-          var jsonData = response.data;
-  
-          if(jsonData.result){
-            var pageInfo = jsonData.data;
-  
-            self.tableData = pageInfo.data;
-            self.totalPages = pageInfo.totalPages;
-            self.totalElements = pageInfo.recordsTotal;
-          }
-          else {
-            self.$message({
-                message: jsonData.message + "",
-                type: "warning"
-              });
-          }
-        }).catch((error)=>{
-          self.loading = false;
-        });
-      },
-      pageSizeChange(pageSize) {
-        this.pageSize = pageSize;
-      },
-      sortChange(data) {
-        this.field = data.column.field;
-        this.direction = data.order == "ascending" ? "asc" : "desc";
-  
-        this.changePage(this.pageIndex);
-      },
-      handleSelectionChange(val) {
-        this.multipleSelection = val;
-      },
-      handleReset(name) {
-        this.$refs[name].resetFields();
-      },
-      handleAdd() {
-        var self = this;
-        
-        self.modalTitle = "新增共享用工信息";
-        self.businessKey = "";
-        self.showModal = true;
-      },
-      handleEdit(record) {
-        var self = this;
-        
-        self.modalTitle = "编辑共享用工信息";
-        self.businessKey = record.id;
-        self.showModal = true;
-      },
-      handleCheck(record){
-        var self = this;
-  
-        this.$confirm("是否确认审核?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-            shareWorksInfoApi.check(record.id).then(function(response) {
-            var jsonData = response.data;
-
-            if (jsonData.result) {
-              // var index = self.tableData.indexOf(record);
-              // self.tableData.splice(index, 1);
-              self.changePage(self.pageIndex);
-
-              self.$message({
-                type: "success",
-                message: "审核成功!"
-              });
-            }
-          });
-        });
-      },
-      handleDelete(record) {
-        var self = this;
-  
-        this.$confirm("是否确认删除?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-            shareWorksInfoApi.remove(record.id).then(function(response) {
-            var jsonData = response.data;
-  
-            if (jsonData.result) {
-              // var index = self.tableData.indexOf(record);
-              // self.tableData.splice(index, 1);
-              self.changePage(self.pageIndex);
-  
-              self.$message({
-                type: "success",
-                message: "删除成功!"
-              });
-            }
-          });
-        });
-      },
-      handleBatchDelete() {
-        var self = this;
-  
-        var idList = this.multipleSelection.map(record => {
-          return record.id;
-        });
-  
-        this.$confirm("是否确认删除选中项?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-            shareWorksInfoApi.batchRemove(idList).then(function(response) {
-            var jsonData = response.data;
-  
-            if (jsonData.result) {
-              self.changePage(self.pageIndex);
-  
-              self.$message({
-                type: "success",
-                message: "删除成功!"
-              });
-            }
-          });
-        });
-      },
-      onDetailModalClose(refreshed) {
-        this.showModal = false;
-  
-        if(refreshed) {
-          this.changePage(this.pageIndex);
-        }
-      },
-    },
-    mounted: function() {
-      var self = this;
-      this.changePage(1);
-    },
-    components: {
-        "shareWorksInfo-detail":shareWorksInfoDetail
-    }
-  };
-  </script>
-  <style lang="scss" scoped>
-  .el-breadcrumb {
-    margin: 10px;
-    line-height: 20px;
-  }
-  
-  .el-divider {
-    margin: 5px 0;
-  }
-  
-  .demo-form-inline {
-    margin-left: 10px;
-    text-align: left;
-  }
-  
-  .button-group {
-    padding: 10px;
-    text-align: left;
-  }
-  </style>

+ 0 - 365
src/views/base/trainingInfo-detail.vue

@@ -1,365 +0,0 @@
-
-<template>
-    <el-dialog
-      :visible.sync="showDialog"
-      :title="title"
-      :modal-append-to-body="false"
-      style="text-align: left;"
-      @close="closeDialog"
-      :close-on-click-modal="false"
-      width="900px"
-    >
-      <div class="user-panel" v-loading="loading">
-        <el-form
-          ref="form"
-          :inline="true"
-          :model="formModel"
-          :rules="ruleValidate"
-          :label-width="'100px'"
-        >
-          <el-form-item label="标题" prop="title">
-            <el-input v-model="formModel.title" placeholder="请输入标题" style="width: 300px"></el-input>
-          </el-form-item>
-          <el-form-item label="咨询电话" prop="phone">
-            <el-input v-model="formModel.phone" placeholder="请输入咨询电话" style="width: 300px"></el-input>
-          </el-form-item>
-          <el-form-item label="企业名称" prop="enterpriseId">
-            <el-select
-            v-model="formModel.enterpriseId"
-            placeholder="请选择"
-            style="width: 300px"
-            clearable
-          >
-            <el-option
-              v-for="item in enterpriseList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
-          </el-select>
-          </el-form-item>
-          <el-form-item label="名称" prop="name">
-            <el-input v-model="formModel.name" placeholder="请输入名称" style="width: 300px"></el-input>
-          </el-form-item>
-          <el-form-item label="缩略图" prop="thumbnailImage">
-              <el-upload
-                  style="width:300px"
-                  class="avatar-uploader"
-                  name="photoFile"
-                  :action="uploadUrl"
-                  :headers="headers"
-                  :data="uploadData"
-                  :show-file-list="false"
-                  :on-success="handleAvatarSuccess"
-                  :before-upload="beforeAvatarUpload">
-                  <img v-if="fileUrl" :src="fileUrl" class="avatar">
-                  <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-              </el-upload>
-          </el-form-item>
-          <el-form-item label="二维码图片" prop="codeImage">
-              <el-upload
-                  style="width:300px"
-                  class="avatar-uploader"
-                  name="photoFile"
-                  :action="uploadUrl"
-                  :headers="headers"
-                  :data="uploadData"
-                  :show-file-list="false"
-                  :on-success="handleAvatarSuccess2"
-                  :before-upload="beforeAvatarUpload">
-                  <img v-if="fileUrl2" :src="fileUrl2" class="avatar">
-                  <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-              </el-upload>
-          </el-form-item>
-          <el-form-item label="报名结束时间" prop="endTime">
-            <el-date-picker
-              style="width: 300px"
-              v-model="formModel.endTime"
-              type="date"
-              placeholder="选择日期"
-              value-format="yyyy-MM-dd"
-              format="yyyy-MM-dd">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="编号:" prop="id">
-            <span>{{formModel.id}}</span>
-          </el-form-item>
-          <el-form-item label="内容" prop="content">
-            <mce-editor
-                ref="editor"
-                uploadName="upfile"
-                v-model="formModel.content"
-                :url="uploadUrl1"
-                :config="editorConfig"
-                style="width: 90%"
-            ></mce-editor>
-        </el-form-item>
-        <el-form-item label="上传附件" prop="file">
-          <el-upload
-            class="upload-demo"
-            name="photoFile"
-            :action="uploadUrl2"
-            :headers="headers"
-            :data="uploadData2"
-            :on-preview="handlePreview"
-            :on-remove="handleRemove"
-            :before-remove="beforeRemove"
-            :on-success="handleAvatarSuccess1"
-            multiple
-            :limit="3"
-            :on-exceed="handleExceed"
-            :file-list="fileList">
-            <el-button size="small" type="primary">点击上传</el-button>
-            <div slot="tip" class="el-upload__tip">只能上传jpg/png文件,且不超过500kb</div>
-          </el-upload>
-        </el-form-item>
-        </el-form>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="closeDialog">取 消</el-button>
-        <el-button type="primary" @click="handleSubmit" :loading="submitting"
-          >确 定</el-button
-        >
-      </span>
-    </el-dialog>
-  </template>
-  <script>
-  import Constant from "@/constant";
-  import { getToken } from "@/utils/auth"; // get token from cookie
-  import trainingInfoApi from "@/api/base/trainingInfo";
-  import MceEditor from "@/components/Tinymce";
-  import dataDictionaryApi from "@/api/sys/dataDictionary";
-  import enterpriseInfoApi from "@/api/base/enterpriseInfo";
-
-  
-  export default {
-    props: ["businessKey", "title"],
-    data() {
-      return {
-          showPwd: true,
-          ruleValidate: {
-              title: [
-              { required: true, message: "标题不能为空", trigger: "blur" },
-              ],
-              phone: [
-              { required: true, message: "咨询电话不能为空", trigger: "blur" },
-              ],
-              author: [
-              { required: true, message: "作者不能为空", trigger: "blur" },
-              ],
-              type: [
-              { required: true, message: "类型不能为空", trigger: "blur" },
-              ],
-          },
-          roleList: [],
-          formModel: {},
-          showDialog: true,
-          loading: false,
-          submitting: false,
-          companyProps: {
-              value: "id",
-              label: "name",
-          },
-          typeList:[],
-          enterpriseList:[],
-          //上传地址
-          uploadUrl: Constant.serverUrl + "/uploadPicture",
-          uploadData: {
-              subFolder: "temporary-workers",
-          },
-          fileUrl: "",
-          fileUrl2:"",
-          headers: {
-              Authorization: getToken(),
-          },
-          uploadUrl1: Constant.serverUrl + "/tinymce/upload?token=" + getToken(),
-          editorConfig: {
-            height: 300,
-            width: 660,
-          },
-          fileList:[],
-          uploadUrl2: Constant.serverUrl + "/uploadFile",
-          uploadData2: {
-              subFolder: "temporary-workers",
-          },
-      };
-    },
-    created() {
-        var self = this;
-
-        dataDictionaryApi.findByCatalogName({catalogName: "共享用工类型",})
-        .then((response) => {
-            var jsonData = response.data;
-            self.typeList = jsonData.data;
-        });
-
-        enterpriseInfoApi.list().then(function (response) {
-          var jsonData = response.data;
-          if (jsonData.result) {
-              if (jsonData.data != null && jsonData.data != "") {
-                  self.enterpriseList = jsonData.data;
-              }
-          }
-        });
-    },
-    methods: {
-      closeDialog() {
-        this.$emit("close", false);
-      },
-      handleSubmit() {
-        var self = this;
-  
-        this.$refs["form"].validate((valid) => {
-          if (valid) {
-            (function () {
-              var id = self.formModel.id;
-
-              self.formModel.fileList = self.fileList
-
-              //alert(self.fileList);
-  
-              if (id == null || id.length == 0) {
-                return trainingInfoApi.add(self.formModel);
-              } else {
-                return trainingInfoApi.update(self.formModel);
-              }
-            })().then(function (response) {
-              var jsonData = response.data;
-  
-              if (jsonData.result) {
-                self.$message({
-                  message: "保存成功!",
-                  type: "success",
-                });
-  
-                self.$emit("close", true);
-              } else {
-                self.$message({
-                  message: jsonData.message + "",
-                  type: "warning",
-                });
-  
-                self.$emit("close", false);
-              }
-            });
-          }
-        });
-      },
-      handleAvatarSuccess(res, file) {
-          var self = this;
-          self.formModel.thumbnailImage = res.data;
-  
-          self.fileUrl =
-            res.data + "?x-oss-process=image/resize,m_lfit,h_300,w_300";
-      },
-      handleAvatarSuccess2(res, file) {
-          var self = this;
-          self.formModel.codeImage = res.data;
-  
-          self.fileUrl2 =
-            res.data + "?x-oss-process=image/resize,m_lfit,h_300,w_300";
-      },
-      beforeAvatarUpload(file) {
-          const isLt2M = file.size / 1024 / 1024 < 2;
-          if (!isLt2M) {
-              this.$message.error('上传头像图片大小不能超过 2MB!');
-          }
-          return isLt2M;
-      },
-      handleAvatarSuccess1(res, file) {
-          var self = this;
-          self.fileList.push(res.data);
-      },
-      handleRemove(file, fileList) {
-        this.fileList = fileList
-        console.log(file, fileList);
-      },
-      handlePreview(file) {
-        console.log(file);
-      },
-      handleExceed(files, fileList) {
-        this.$message.warning(`当前限制选择 3 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`);
-      },
-      beforeRemove(file, fileList) {
-        return this.$confirm(`确定移除 ${ file.name }?`);
-      }
-    },
-    async mounted() {
-      var self = this;
-      self.loading = true;
-  
-      (function () {
-        if (self.businessKey != null && self.businessKey.length > 0) {
-          return trainingInfoApi.edit(self.businessKey);
-        } else {
-          return trainingInfoApi.create();
-        }
-      })()
-        .then((response) => {
-          var jsonData = response.data;
-  
-          if (jsonData.result) {
-            self.formModel = jsonData.data;
-
-            if (self.formModel.content != null) {
-                self.$refs.editor.setContent(self.formModel.content);
-            }
-
-            let thumbnailImage = self.formModel.thumbnailImage;
-            if (thumbnailImage != null) {
-                self.fileUrl = thumbnailImage 
-            }
-
-            let codeImage = self.formModel.codeImage;
-            if (codeImage != null) {
-                self.fileUrl2 = codeImage 
-            }
-
-            self.fileList = self.formModel.fileList
-
-            self.showModal = true;
-          } else {
-            self.$message.error(jsonData.message + "");
-          }
-  
-          self.loading = false;
-        })
-        .catch((error) => {
-          self.$message.error(error + "");
-          self.loading = false;
-        });
-    },
-    components: {
-        "mce-editor": MceEditor,
-    },
-  };
-  </script>
-  <style scoped>
-  .user-panel {
-    margin: 10px auto;
-  }
-  
-  .avatar-uploader .el-upload {
-      border: 1px dashed #d9d9d9;
-      border-radius: 6px;
-      cursor: pointer;
-      position: relative;
-      overflow: hidden;
-    }
-    .avatar-uploader .el-upload:hover {
-      border-color: #409EFF;
-    }
-    .avatar-uploader-icon {
-      font-size: 28px;
-      color: #8c939d;
-      width: 178px;
-      height: 178px;
-      line-height: 178px;
-      text-align: center;
-    }
-    .avatar {
-      width: 178px;
-      height: 178px;
-      display: block;
-    }
-  </style>

+ 0 - 349
src/views/base/trainingInfo-list.vue

@@ -1,349 +0,0 @@
-<template>
-    <div>
-      <el-breadcrumb separator=">">
-        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-        <el-breadcrumb-item>
-          <a href="#">基础信息管理</a>
-        </el-breadcrumb-item>
-        <el-breadcrumb-item>
-          培训信息
-        </el-breadcrumb-item>
-      </el-breadcrumb>
-      <el-divider></el-divider>
-      <!--
-        要resetFields起作用,必须配置:model和prop
-      -->
-      <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
-        <el-form-item label="标题" prop="name">
-          <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button
-            type="primary"
-            size="mini"
-            icon="ios-search"
-            @click="changePage(1)"
-            :loading="loading"
-          >查询</el-button>&nbsp;
-          <el-button
-            type="info"
-            size="mini"
-            style="margin-left: 8px"
-            @click="handleReset('queryForm')"
-          >重置</el-button>&nbsp;
-        </el-form-item>
-      </el-form>
-      <el-divider></el-divider>
-      <el-row class="button-group">
-        <el-button type="primary" size="small" plain icon="el-icon-circle-plus" @click="handleAdd">新增</el-button>
-        <el-button
-          type="primary"
-          size="small"
-          plain
-          icon="el-icon-remove"
-          :disabled="multipleSelection.length==0"
-          @click="handleBatchDelete"
-        >删除选中项</el-button>
-      </el-row>
-      <el-table
-        :data="tableData"
-        style="min-height:400px;"
-        v-loading="loading"
-        stripe
-        @sort-change="sortChange"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column  prop="thumbnailImage"  label="缩略图">
-            <template slot-scope="{row}">
-            <a v-if="row.thumbnailImage" :href="row.thumbnailImage" target="_blank">
-              <el-image
-              style="width: 50px; height: 50px"
-              :src="row.thumbnailImage"
-              fit="fit"></el-image>
-            </a>
-          </template>
-        </el-table-column>
-        <el-table-column  prop="enterpriseName"  label="企业名称"></el-table-column>
-        <el-table-column  prop="name"  label="名称"></el-table-column>
-        <el-table-column  prop="title"  label="标题" width="200"></el-table-column>
-
-        <el-table-column  prop="file"  label="下载文件" width="350">
-          <template slot-scope="{row}">
-            <div v-for="(item,index) in row.fileList" v-bind:key="index">
-              <el-link :href="item.url" target="_blank" type="primary">{{item.name}}</el-link>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column  prop="endTime"  label="结束时间" width="130"></el-table-column>
-        <el-table-column  prop="status"  label="审核状态">
-          <template slot-scope="{row}">
-            <span v-if="row.status=='0'" style="color: #F56C6C;">未审核</span>
-            <span v-else-if="row.status=='1'" style="color: #67C23A;">已审核</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" fixed="right" width="300">
-          <template slot-scope="{row}">
-            <el-button size="mini" type="warning" @click="handleEdit(row)">编辑</el-button>
-            <el-button v-if="row.status=='0'" size="mini" type="primary" @click="handleCheck(row)">审核</el-button>
-            <el-button size="mini" type="success" @click="handlePersonList(row)">报名人员</el-button>
-            <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-        :current-page.sync="pageIndex"
-        :total="totalElements"
-        :page-sizes="pageSizeList"
-        @current-change="changePage"
-        @size-change="pageSizeChange"
-        layout="total, sizes, prev, pager, next, jumper"
-      ></el-pagination>
-      <trainingInfo-detail
-        v-if="showModal"
-        ref="userDetail"
-        :businessKey="businessKey"
-        :title="modalTitle"
-        @close="onDetailModalClose"
-      ></trainingInfo-detail>
-      <trainingPerson-list
-        v-if="showModal2"
-        :businessKey="businessKey"
-        :title="modalTitle2"
-        @close="onDetailModalClose2"
-      ></trainingPerson-list>
-    </div>
-  </template>
-  <script>
-  import trainingInfoApi from "@/api/base/trainingInfo";
-  import trainingInfoDetail from "./trainingInfo-detail";
-  import trainingPersonList from "./trainingPerson-list";
-  
-  export default {
-    name: 'baseTrainingInfoList',
-    data() {
-      var self = this;
-  
-      return {
-        queryModel: {
-          name: "",
-        },
-        loading: false,
-        tableData: [],
-        pageIndex: 1,
-        pageSize: 10,
-        totalPages: 0,
-        totalElements: 0,
-        field: "",
-        direction: "",
-        pageSizeList: [10, 20, 30],
-        multipleSelection: [],
-        modalTitle: "",
-        modalTitle2: "",          
-        businessKey: "",
-        showModal: false,
-        showModal2: false,
-        dialogFormVisible:false,
-        newPassword:"",
-        roleResult:[],
-        props: {
-          // 配置项(必选)
-          value: "id",
-          label: "name",
-          children: "children"
-        },
-      };
-    },
-    methods: {
-      changePage(pageIndex) {
-        var self = this;
-  
-        console.log(pageIndex);
-  
-        self.pageIndex = pageIndex;
-        var formData = new FormData();
-  
-        formData.append("pageIndex", self.pageIndex);
-        formData.append("pageSize", self.pageSize);
-  
-        formData.append("name", self.queryModel.name);
-        
-  
-        self.loading = true;
-  
-        trainingInfoApi.pageList(formData).then(function(response) {
-          self.loading = false;
-  
-          var jsonData = response.data;
-  
-          if(jsonData.result){
-            var pageInfo = jsonData.data;
-  
-            self.tableData = pageInfo.data;
-            self.totalPages = pageInfo.totalPages;
-            self.totalElements = pageInfo.recordsTotal;
-          }
-          else {
-            self.$message({
-                message: jsonData.message + "",
-                type: "warning"
-              });
-          }
-        }).catch((error)=>{
-          self.loading = false;
-        });
-      },
-      pageSizeChange(pageSize) {
-        this.pageSize = pageSize;
-      },
-      sortChange(data) {
-        this.field = data.column.field;
-        this.direction = data.order == "ascending" ? "asc" : "desc";
-  
-        this.changePage(this.pageIndex);
-      },
-      handleSelectionChange(val) {
-        this.multipleSelection = val;
-      },
-      handleReset(name) {
-        this.$refs[name].resetFields();
-      },
-      handleAdd() {
-        var self = this;
-        
-        self.modalTitle = "新增培训信息";
-        self.businessKey = "";
-        self.showModal = true;
-      },
-      handleEdit(record) {
-        var self = this;
-        
-        self.modalTitle = "编辑培训信息";
-        self.businessKey = record.id;
-        self.showModal = true;
-      },
-      handleCheck(record){
-        var self = this;
-  
-        this.$confirm("是否确认审核?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          trainingInfoApi.check(record.id).then(function(response) {
-            var jsonData = response.data;
-
-            if (jsonData.result) {
-              // var index = self.tableData.indexOf(record);
-              // self.tableData.splice(index, 1);
-              self.changePage(self.pageIndex);
-
-              self.$message({
-                type: "success",
-                message: "审核成功!"
-              });
-            }
-          });
-        });
-      },
-      handleDelete(record) {
-        var self = this;
-  
-        this.$confirm("是否确认删除?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          trainingInfoApi.remove(record.id).then(function(response) {
-            var jsonData = response.data;
-  
-            if (jsonData.result) {
-              // var index = self.tableData.indexOf(record);
-              // self.tableData.splice(index, 1);
-              self.changePage(self.pageIndex);
-  
-              self.$message({
-                type: "success",
-                message: "删除成功!"
-              });
-            }
-          });
-        });
-      },
-      handleBatchDelete() {
-        var self = this;
-  
-        var idList = this.multipleSelection.map(record => {
-          return record.id;
-        });
-  
-        this.$confirm("是否确认删除选中项?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          trainingInfoApi.batchRemove(idList).then(function(response) {
-            var jsonData = response.data;
-  
-            if (jsonData.result) {
-              self.changePage(self.pageIndex);
-  
-              self.$message({
-                type: "success",
-                message: "删除成功!"
-              });
-            }
-          });
-        });
-      },
-      onDetailModalClose(refreshed) {
-        this.showModal = false;
-  
-        if(refreshed) {
-          this.changePage(this.pageIndex);
-        }
-      },
-      handlePersonList(record) {
-        var self = this;
-        self.modalTitle2 = "培训报名人员";
-        self.businessKey = record.id;
-        self.showModal2 = true;
-      },
-      onDetailModalClose2(refreshed) {
-        this.showModal2 = false;
-  
-        if(refreshed) {
-          this.changePage(this.pageIndex);
-        }
-      },
-    },
-    mounted: function() {
-      var self = this;
-      this.changePage(1);
-    },
-    components: {
-        "trainingInfo-detail":trainingInfoDetail,
-        "trainingPerson-list":trainingPersonList,
-    }
-  };
-  </script>
-  <style lang="scss" scoped>
-  .el-breadcrumb {
-    margin: 10px;
-    line-height: 20px;
-  }
-  
-  .el-divider {
-    margin: 5px 0;
-  }
-  
-  .demo-form-inline {
-    margin-left: 10px;
-    text-align: left;
-  }
-  
-  .button-group {
-    padding: 10px;
-    text-align: left;
-  }
-  </style>

+ 0 - 177
src/views/base/trainingPerson-list.vue

@@ -1,177 +0,0 @@
-
-<template>
-    <el-dialog
-      :visible.sync="showDialog"
-      :title="title"
-      :modal-append-to-body="false"
-      style="text-align: left;"
-      @close="closeDialog"
-      :close-on-click-modal="false"
-      width="900px"
-    >
-      <div class="user-panel" v-loading="loading">
-        <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
-            <el-form-item label="姓名" prop="name">
-                <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
-            </el-form-item>
-            <el-form-item label="联系电话" prop="phone">
-                <el-input type="text" size="mini" v-model="queryModel.phone"></el-input>
-            </el-form-item>
-            <el-form-item>
-            <el-button
-                type="primary"
-                size="mini"
-                icon="ios-search"
-                @click="changePage(1)"
-                :loading="loading"
-            >查询</el-button>&nbsp;
-            <el-button
-                type="info"
-                size="mini"
-                style="margin-left: 8px"
-                @click="handleReset('queryForm')"
-            >重置</el-button>&nbsp;
-            </el-form-item>
-        </el-form>
-        <el-divider></el-divider>
-        <el-table
-        :data="tableData"
-        style="min-height:400px;"
-        v-loading="loading"
-        stripe
-        @sort-change="sortChange"
-        @selection-change="handleSelectionChange"
-      >
-            <!-- <el-table-column type="selection" width="55"></el-table-column> -->
-            <el-table-column  prop="workPersonName"  label="姓名"></el-table-column>
-            <el-table-column  prop="phone"  label="联系电话"></el-table-column>
-            <el-table-column  prop="gender"  label="性别">
-                <template slot-scope="{row}">
-                    <span v-if="row.gender=='0'">男</span>
-                    <span v-else-if="row.gender=='1'">女</span>
-                </template>
-            </el-table-column>
-            <el-table-column  prop="age"  label="年龄"></el-table-column>
-            <el-table-column  prop="createTime"  label="报名时间"></el-table-column>
-
-            <!-- <el-table-column label="操作" width="250">
-            <template slot-scope="{row}">
-                <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
-            </template>
-            </el-table-column> -->
-        </el-table>
-        <el-pagination
-            style="text-align: center;"
-            :current-page.sync="pageIndex"
-            :total="totalElements"
-            :page-sizes="pageSizeList"
-            @current-change="changePage"
-            @size-change="pageSizeChange"
-            layout="total, sizes, prev, pager, next, jumper"
-        ></el-pagination>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="closeDialog">取 消</el-button>
-      </span>
-    </el-dialog>
-  </template>
-  <script>
-  import trainingPersonApi from "@/api/base/trainingPerson";
-  
-  export default {
-    props: ["businessKey", "title"],
-    data() {
-      return {
-            submitting: false,
-            queryModel: {
-                name:"",
-                phone:"",
-            },
-            showDialog: true,
-            loading: false,
-            tableData: [],
-            pageIndex: 1,
-            pageSize: 10,
-            totalPages: 0,
-            totalElements: 0,
-            field: "",
-            direction: "",
-            pageSizeList: [10, 20, 30],
-            multipleSelection: [],
-      };
-    },
-    created() {
-
-    },
-    methods: {
-      closeDialog() {
-        this.$emit("close", false);
-      },
-      changePage(pageIndex) {
-        var self = this;
-  
-        console.log(pageIndex);
-  
-        self.pageIndex = pageIndex;
-        var formData = new FormData();
-  
-        formData.append("pageIndex", self.pageIndex);
-        formData.append("pageSize", self.pageSize);
-  
-        formData.append("trainingId", self.businessKey);
-        formData.append("name", self.queryModel.name);
-        formData.append("phone", self.queryModel.phone);
-  
-        self.loading = true;
-  
-        trainingPersonApi.pageList(formData).then(function(response) {
-          self.loading = false;
-  
-          var jsonData = response.data;
-  
-          if(jsonData.result){
-            var pageInfo = jsonData.data;
-  
-            self.tableData = pageInfo.data;
-            self.totalPages = pageInfo.totalPages;
-            self.totalElements = pageInfo.recordsTotal;
-          }
-          else {
-            self.$message({
-                message: jsonData.message + "",
-                type: "warning"
-              });
-          }
-        }).catch((error)=>{
-          self.loading = false;
-        });
-      },
-      handleReset(name) {
-        this.$refs[name].resetFields();
-      },
-      pageSizeChange(pageSize) {
-        this.pageSize = pageSize;
-      },
-      sortChange(data) {
-        this.field = data.column.field;
-        this.direction = data.order == "ascending" ? "asc" : "desc";
-  
-        this.changePage(this.pageIndex);
-      },
-      handleSelectionChange(val) {
-        this.multipleSelection = val;
-      },
-    },
-    async mounted() {
-      var self = this;
-      self.changePage(1);
-    },
-    components: {
-    },
-  };
-  </script>
-  <style scoped>
-  .user-panel {
-    margin: 10px auto;
-  }
-  </style>

+ 0 - 274
src/views/statistical/dailyGroupReport-list.vue

@@ -1,274 +0,0 @@
-<template>
-    <div>
-      <el-breadcrumb separator=">">
-        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-        <el-breadcrumb-item>
-          <a href="#">统计报表</a>
-        </el-breadcrumb-item>
-        <el-breadcrumb-item>
-          分组统计日报表
-        </el-breadcrumb-item>
-      </el-breadcrumb>
-      <el-divider></el-divider>
-      <!--
-        要resetFields起作用,必须配置:model和prop
-      -->
-      <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
-        <el-form-item label="选择日期" prop="dateRange">
-            <el-date-picker
-              size="mini"
-              v-model="queryModel.dateRange"
-              type="daterange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              value-format="yyyy-MM-dd"
-                format="yyyy-MM-dd">
-            </el-date-picker>
-            </el-form-item>
-        <el-form-item>
-          <el-button
-            type="primary"
-            size="mini"
-            icon="ios-search"
-            @click="changePage(false)"
-            :loading="loading"
-          >查询</el-button>&nbsp;
-          <el-button
-            type="info"
-            size="mini"
-            style="margin-left: 8px"
-            @click="handleReset('queryForm')"
-          >重置</el-button>&nbsp;
-        </el-form-item>
-      </el-form>
-      <el-divider></el-divider>
-      <el-row class="button-group">
-        <el-button
-          type="primary"
-          size="small"
-          plain
-          icon="el-icon-upload2"
-          @click="exportXls"
-        >导出数据</el-button>
-        <!-- <el-button
-          type="primary"
-          size="small"
-          plain
-          icon="el-icon-upload2"
-          @click="handleTest"
-        >测试保存</el-button> -->
-      </el-row>
-      <el-table
-        :data="tableData"
-        v-loading="loading"
-        height="500"
-        stripe
-        :header-cell-style="headClass"
-        @sort-change="sortChange"
-      >
-        <el-table-column  prop="date" label="日期" width="120"></el-table-column>
-        <el-table-column  label="登录人数">
-            <el-table-column  prop="loginNum"  label="新增人数">
-            </el-table-column>
-            <el-table-column  prop="totalLoginNum"  label="累计人数">
-            </el-table-column>
-        </el-table-column>
-        <el-table-column  label="注册人数">
-            <el-table-column  prop="dailyPersonRegNum"  label="今日注册人数">
-            </el-table-column>
-            <el-table-column  prop="totalPersonRegNum"  label="累计注册人数">
-            </el-table-column>
-        </el-table-column>
-        <el-table-column   label="认证人数">
-            <el-table-column  prop="personNum"  label="新增人数">
-            </el-table-column>
-            <el-table-column  prop="totalPersonNum"  label="累计人数">
-            </el-table-column>
-        </el-table-column>
-        <el-table-column   label="简历数">
-            <el-table-column  prop="totalJobInformation"  label="累计简历数">
-            </el-table-column>
-        </el-table-column>
-        <el-table-column    label="认证企业数">
-            <el-table-column  prop="enterpriseNum"  label="新增线上登记">
-            </el-table-column>
-            <el-table-column  prop="totalEnterpriseNum"  label="累计企业数量">
-            </el-table-column>
-        </el-table-column>
-        <el-table-column   label="岗位数量">
-            <el-table-column  prop="recruitNum"  label="新增发布岗位数量">
-            </el-table-column>
-            <el-table-column  prop="totalRecruitNum"  label="实时发布岗位数">
-            </el-table-column>
-            <el-table-column  prop="totalRecruitStatusNum"  label="累计岗位发布数量">
-            </el-table-column>
-            <el-table-column  prop="jobRequirementNum"  label="岗位需求人数">
-            </el-table-column>
-            <el-table-column  prop="totalJobRequirementNum"  label="累计岗位需求人数">
-            </el-table-column>
-        </el-table-column>
-        <el-table-column  label="求职数">
-            <el-table-column  prop="jobInformationNum"  label="今日报名人数">
-            </el-table-column>
-        </el-table-column>
-      </el-table>
-    </div>
-  </template>
-  <script>
-  import reportApi from "@/api/statistical/report";
-  
-  export default {
-    name: 'statisticalDailyGroupReportList',
-    data() {
-      var self = this;
-  
-      return {
-        queryModel: {
-          dateRange:[this.initCurDate(),this.initCurDate()]
-        },
-        loading: false,
-        tableData: [],
-        pageIndex: 1,
-        pageSize: 10,
-        totalPages: 0,
-        totalElements: 0,
-        field: "",
-        direction: "",
-        pageSizeList: [10, 20, 30],
-        multipleSelection: [],
-        modalTitle: "",      
-        businessKey: "",
-        showModal: false,
-        dialogFormVisible:false,
-        newPassword:"",
-        roleResult:[],
-        props: {
-          // 配置项(必选)
-          value: "id",
-          label: "name",
-          children: "children"
-        },
-      };
-    },
-    methods: {
-        headClass(){
-            return "text-align: center;"
-        },
-        initCurDate(){
-            const now = new Date();
-            const year = now.getFullYear();
-            const month = ('0' + (now.getMonth() + 1)).slice(-2);
-            const day = ('0' + now.getDate()).slice(-2);
-            const formattedTime = year +"-"+ month +"-"+ day;
-            return formattedTime;
-        },
-        handleTest(){
-            var self = this;
-    
-            reportApi.dailyGroupReportTest().then(function(response) {
-              var jsonData = response.data;
-    
-            }).catch((error)=>{
-              self.loading = false;
-            });
-        },
-        changePage(exportFlag) {
-            var self = this;
-            var formData = new FormData();
-
-            //alert(exportFlag)
-    
-            formData.append("date", self.queryModel.date);
-            formData.append("exportFlag", exportFlag);
-
-            formData.append("dateRange", self.queryModel.dateRange);
-    
-            self.loading = true;
-    
-            reportApi.dailyGroupReport(formData).then(function(response) {
-            self.loading = false;
-    
-            var jsonData = response.data;
-    
-            if(jsonData.result){
-                if(exportFlag){
-                    //导出
-                    self.$message({
-                        showClose: true,
-                        type: "success",
-                        message: `报表已生成,<a href="${jsonData.data}">请点击链接下载</a>`,
-                        dangerouslyUseHTMLString: true,
-                        duration: 30000
-                    });
-                }
-                else{
-                    //分页查看
-                    var page = jsonData.data;
-                    self.tableData = page.data;
-                }
-            }
-            else {
-                self.$message({
-                    message: jsonData.message + "",
-                    type: "warning"
-                });
-            }
-            }).catch((error)=>{
-            self.loading = false;
-            });
-        },
-        pageSizeChange(pageSize) {
-            this.pageSize = pageSize;
-        },
-        sortChange(data) {
-            this.field = data.column.field;
-            this.direction = data.order == "ascending" ? "asc" : "desc";
-    
-            this.changePage(false);
-        },
-        handleSelectionChange(val) {
-            this.multipleSelection = val;
-        },
-        handleReset(name) {
-            this.$refs[name].resetFields();
-        },
-        onDetailModalClose(refreshed) {
-            this.showModal = false;
-    
-            if(refreshed) {
-            this.changePage(false);
-            }
-        },
-        exportXls() {
-        this.changePage(true);
-      },
-    },
-    mounted: function() {
-      var self = this;
-      this.changePage(false);
-    },
-    components: {
-    }
-  };
-  </script>
-  <style lang="scss" scoped>
-  .el-breadcrumb {
-    margin: 10px;
-    line-height: 20px;
-  }
-  
-  .el-divider {
-    margin: 5px 0;
-  }
-  
-  .demo-form-inline {
-    margin-left: 10px;
-    text-align: left;
-  }
-  
-  .button-group {
-    padding: 10px;
-    text-align: left;
-  }
-  </style>

+ 0 - 257
src/views/statistical/dailyReport-list.vue

@@ -1,257 +0,0 @@
-<template>
-    <div>
-      <el-breadcrumb separator=">">
-        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-        <el-breadcrumb-item>
-          <a href="#">统计报表</a>
-        </el-breadcrumb-item>
-        <el-breadcrumb-item>
-          统计日报表
-        </el-breadcrumb-item>
-      </el-breadcrumb>
-      <el-divider></el-divider>
-      <!--
-        要resetFields起作用,必须配置:model和prop
-      -->
-      <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
-        <el-form-item label="选择日期" prop="dateRange">
-            <el-date-picker
-              size="mini"
-              v-model="queryModel.dateRange"
-              type="daterange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              value-format="yyyy-MM-dd"
-                format="yyyy-MM-dd">
-            </el-date-picker>
-            </el-form-item>
-        <el-form-item>
-          <el-button
-            type="primary"
-            size="mini"
-            icon="ios-search"
-            @click="changePage(false)"
-            :loading="loading"
-          >查询</el-button>&nbsp;
-          <el-button
-            type="info"
-            size="mini"
-            style="margin-left: 8px"
-            @click="handleReset('queryForm')"
-          >重置</el-button>&nbsp;
-        </el-form-item>
-      </el-form>
-      <el-divider></el-divider>
-      <el-row class="button-group">
-        <el-button
-          type="primary"
-          size="small"
-          plain
-          icon="el-icon-upload2"
-          @click="exportXls"
-        >导出数据</el-button>
-      </el-row>
-      <el-table
-        :data="tableData"
-        v-loading="loading"
-        stripe
-        :header-cell-style="headClass"
-        @sort-change="sortChange"
-      >
-        <el-table-column  label="登录人数">
-            <el-table-column  prop="loginNum"  label="新增人数">
-            </el-table-column>
-            <el-table-column  prop="totalLoginNum"  label="累计人数">
-            </el-table-column>
-        </el-table-column>
-        <el-table-column  label="注册人数">
-            <el-table-column  prop="dailyPersonRegNum"  label="今日注册人数">
-            </el-table-column>
-            <el-table-column  prop="totalPersonRegNum"  label="累计注册人数">
-            </el-table-column>
-        </el-table-column>
-        <el-table-column   label="认证人数">
-            <el-table-column  prop="personNum"  label="新增人数">
-            </el-table-column>
-            <el-table-column  prop="totalPersonNum"  label="累计人数">
-            </el-table-column>
-        </el-table-column>
-        <el-table-column   label="简历数">
-            <el-table-column  prop="totalJobInformation"  label="累计简历数">
-            </el-table-column>
-        </el-table-column>
-        <el-table-column    label="认证企业数">
-            <el-table-column  prop="enterpriseNum"  label="新增线上登记">
-            </el-table-column>
-            <el-table-column  prop="totalEnterpriseNum"  label="累计企业数量">
-            </el-table-column>
-        </el-table-column>
-        <el-table-column   label="岗位数量">
-            <el-table-column  prop="recruitNum"  label="新增发布岗位数量">
-            </el-table-column>
-            <el-table-column  prop="totalRecruitNum"  label="实时发布岗位数">
-            </el-table-column>
-            <el-table-column  prop="totalRecruitStatusNum"  label="累计岗位发布数量">
-            </el-table-column>
-            <el-table-column  prop="jobRequirementNum"  label="岗位需求人数">
-            </el-table-column>
-        </el-table-column>
-        <el-table-column  label="岗位需求人数">
-            <el-table-column  prop="totalJobRequirementNum"  label="累计岗位需求人数">
-            </el-table-column>
-        </el-table-column>
-        <el-table-column  label="求职数">
-            <el-table-column  prop="jobInformationNum"  label="今日报名人数">
-            </el-table-column>
-        </el-table-column>
-      </el-table>
-    </div>
-  </template>
-  <script>
-  import reportApi from "@/api/statistical/report";
-  
-  export default {
-    name: 'statisticalDailyReportList',
-    data() {
-      var self = this;
-  
-      return {
-        queryModel: {
-          dateRange:[this.initCurDate(),this.initCurDate()]
-        },
-        loading: false,
-        tableData: [],
-        pageIndex: 1,
-        pageSize: 10,
-        totalPages: 0,
-        totalElements: 0,
-        field: "",
-        direction: "",
-        pageSizeList: [10, 20, 30],
-        multipleSelection: [],
-        modalTitle: "",      
-        businessKey: "",
-        showModal: false,
-        dialogFormVisible:false,
-        newPassword:"",
-        roleResult:[],
-        props: {
-          // 配置项(必选)
-          value: "id",
-          label: "name",
-          children: "children"
-        },
-      };
-    },
-    methods: {
-        headClass(){
-            return "text-align: center;"
-        },
-        initCurDate(){
-            const now = new Date();
-            const year = now.getFullYear();
-            const month = ('0' + (now.getMonth() + 1)).slice(-2);
-            const day = ('0' + now.getDate()).slice(-2);
-            const formattedTime = year +"-"+ month +"-"+ day;
-            return formattedTime;
-        },
-        changePage(exportFlag) {
-            var self = this;
-            var formData = new FormData();
-
-            //alert(exportFlag)
-    
-            formData.append("date", self.queryModel.date);
-            formData.append("exportFlag", exportFlag);
-
-            formData.append("dateRange", self.queryModel.dateRange);
-    
-            self.loading = true;
-    
-            reportApi.dailyReport(formData).then(function(response) {
-            self.loading = false;
-    
-            var jsonData = response.data;
-    
-            if(jsonData.result){
-                if(exportFlag){
-                    //导出
-                    self.$message({
-                        showClose: true,
-                        type: "success",
-                        message: `报表已生成,<a href="${jsonData.data}">请点击链接下载</a>`,
-                        dangerouslyUseHTMLString: true,
-                        duration: 30000
-                    });
-                }
-                else{
-                    //分页查看
-                    var page = jsonData.data;
-                    self.tableData = page.data;
-                }
-            }
-            else {
-                self.$message({
-                    message: jsonData.message + "",
-                    type: "warning"
-                });
-            }
-            }).catch((error)=>{
-            self.loading = false;
-            });
-        },
-        pageSizeChange(pageSize) {
-            this.pageSize = pageSize;
-        },
-        sortChange(data) {
-            this.field = data.column.field;
-            this.direction = data.order == "ascending" ? "asc" : "desc";
-    
-            this.changePage(false);
-        },
-        handleSelectionChange(val) {
-            this.multipleSelection = val;
-        },
-        handleReset(name) {
-            this.$refs[name].resetFields();
-        },
-        onDetailModalClose(refreshed) {
-            this.showModal = false;
-    
-            if(refreshed) {
-            this.changePage(false);
-            }
-        },
-        exportXls() {
-        this.changePage(true);
-      },
-    },
-    mounted: function() {
-      var self = this;
-      this.changePage(false);
-    },
-    components: {
-    }
-  };
-  </script>
-  <style lang="scss" scoped>
-  .el-breadcrumb {
-    margin: 10px;
-    line-height: 20px;
-  }
-  
-  .el-divider {
-    margin: 5px 0;
-  }
-  
-  .demo-form-inline {
-    margin-left: 10px;
-    text-align: left;
-  }
-  
-  .button-group {
-    padding: 10px;
-    text-align: left;
-  }
-  </style>

+ 0 - 278
src/views/statistical/generateReport-list.vue

@@ -1,278 +0,0 @@
-<template>
-    <div>
-      <el-breadcrumb separator=">">
-        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-        <el-breadcrumb-item>
-          <a href="#">统计报表</a>
-        </el-breadcrumb-item>
-        <el-breadcrumb-item>
-          历史分组统计日报表
-        </el-breadcrumb-item>
-      </el-breadcrumb>
-      <el-divider></el-divider>
-      <!--
-        要resetFields起作用,必须配置:model和prop
-      -->
-      <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
-        <el-form-item label="选择日期" prop="dateRange">
-            <el-date-picker
-              size="mini"
-              v-model="queryModel.dateRange"
-              type="daterange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              value-format="yyyy-MM-dd"
-                format="yyyy-MM-dd">
-            </el-date-picker>
-            </el-form-item>
-        <el-form-item>
-          <el-button
-            type="primary"
-            size="mini"
-            icon="ios-search"
-            @click="changePage(false)"
-            :loading="loading"
-          >查询</el-button>&nbsp;
-          <el-button
-            type="info"
-            size="mini"
-            style="margin-left: 8px"
-            @click="handleReset('queryForm')"
-          >重置</el-button>&nbsp;
-        </el-form-item>
-      </el-form>
-      <el-divider></el-divider>
-      <el-row class="button-group">
-        <el-button
-          type="primary"
-          size="small"
-          plain
-          icon="el-icon-upload2"
-          @click="exportXls"
-        >导出数据</el-button>
-      </el-row>
-      <el-table
-        :data="tableData"
-        v-loading="loading"
-        height="500"
-        stripe
-        :header-cell-style="headClass"
-        @sort-change="sortChange"
-      >
-        <el-table-column  prop="dateStr" label="日期" width="120"></el-table-column>
-        <el-table-column  label="登录人数">
-            <el-table-column  prop="loginNum"  label="新增人数">
-            </el-table-column>
-            <el-table-column  prop="totalLoginNum"  label="累计人数">
-            </el-table-column>
-        </el-table-column>
-        <el-table-column  label="注册人数">
-            <el-table-column  prop="dailyPersonRegNum"  label="今日注册人数">
-            </el-table-column>
-            <el-table-column  prop="totalPersonRegNum"  label="累计注册人数">
-            </el-table-column>
-        </el-table-column>
-        <el-table-column   label="认证人数">
-            <el-table-column  prop="personNum"  label="新增人数">
-            </el-table-column>
-            <el-table-column  prop="totalPersonNum"  label="累计人数">
-            </el-table-column>
-        </el-table-column>
-        <el-table-column   label="简历数">
-            <el-table-column  prop="totalJobInformation"  label="累计简历数">
-            </el-table-column>
-        </el-table-column>
-        <el-table-column    label="认证企业数">
-            <el-table-column  prop="enterpriseNum"  label="新增线上登记">
-            </el-table-column>
-            <el-table-column  prop="totalEnterpriseNum"  label="累计企业数量">
-            </el-table-column>
-        </el-table-column>
-        <el-table-column   label="岗位数量">
-            <el-table-column  prop="recruitNum"  label="新增发布岗位数量">
-            </el-table-column>
-            <el-table-column  prop="totalRecruitNum"  label="实时发布岗位数">
-            </el-table-column>
-            <el-table-column  prop="totalRecruitStatusNum"  label="累计岗位发布数量">
-            </el-table-column>
-            <el-table-column  prop="jobRequirementNum"  label="岗位需求人数">
-            </el-table-column>
-            <el-table-column  prop="totalJobRequirementNum"  label="累计岗位需求人数">
-            </el-table-column>
-        </el-table-column>
-        <el-table-column  label="求职数">
-            <el-table-column  prop="jobInformationNum"  label="今日报名人数">
-            </el-table-column>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-        :current-page.sync="pageIndex"
-        :total="totalElements"
-        :page-sizes="pageSizeList"
-        @current-change="changePage"
-        @size-change="pageSizeChange"
-        layout="total, sizes, prev, pager, next, jumper"
-      ></el-pagination>
-    </div>
-  </template>
-  <script>
-  import generateReportApi from "@/api/statistical/generateReport";
-  
-  export default {
-    name: 'statisticalGenerateReportList',
-    data() {
-      var self = this;
-  
-      return {
-        queryModel: {
-          dateRange:[this.initCurDate(),this.initCurDate()]
-        },
-        loading: false,
-        tableData: [],
-        pageIndex: 1,
-        pageSize: 10,
-        totalPages: 0,
-        totalElements: 0,
-        field: "",
-        direction: "",
-        pageSizeList: [10, 20, 30],
-        multipleSelection: [],
-        modalTitle: "",      
-        businessKey: "",
-        showModal: false,
-        dialogFormVisible:false,
-        newPassword:"",
-        roleResult:[],
-        props: {
-          // 配置项(必选)
-          value: "id",
-          label: "name",
-          children: "children"
-        },
-      };
-    },
-    methods: {
-        headClass(){
-            return "text-align: center;"
-        },
-        initCurDate(){
-            const now = new Date();
-            const year = now.getFullYear();
-            const month = ('0' + (now.getMonth() + 1)).slice(-2);
-            const day = ('0' + now.getDate()).slice(-2);
-            const formattedTime = year +"-"+ month +"-"+ day;
-            return formattedTime;
-        },
-        changePage(pageIndex,exportFlag) {
-            var self = this;
-            var formData = new FormData();
-
-            //alert(exportFlag)
-    
-            formData.append("date", self.queryModel.date);
-            formData.append("pageIndex", self.pageIndex);
-            //formData.append("exportFlag", exportFlag);
-
-            if(exportFlag!=null){
-                formData.append("exportFlag", exportFlag);
-                formData.append("pageSize", 10000);
-            }
-            else{
-                formData.append("pageSize", self.pageSize);
-            }
-
-            formData.append("dateRange", self.queryModel.dateRange);
-    
-            self.loading = true;
-    
-            generateReportApi.pageList(formData).then(function(response) {
-            self.loading = false;
-    
-            var jsonData = response.data;
-    
-            if(jsonData.result){
-                if(exportFlag){
-                    //导出
-                    self.$message({
-                        showClose: true,
-                        type: "success",
-                        message: `报表已生成,<a href="${jsonData.data}">请点击链接下载</a>`,
-                        dangerouslyUseHTMLString: true,
-                        duration: 30000
-                    });
-                }
-                else{
-                    //分页查看
-                    var page = jsonData.data;
-                    self.tableData = page.data;
-                    
-                    self.tableData = page.data;
-                    self.totalPages = page.totalPages;
-                    self.totalElements = page.totalElements;
-                }
-            }
-            else {
-                self.$message({
-                    message: jsonData.message + "",
-                    type: "warning"
-                });
-            }
-            }).catch((error)=>{
-            self.loading = false;
-            });
-        },
-        pageSizeChange(pageSize) {
-            this.pageSize = pageSize;
-        },
-        sortChange(data) {
-            this.field = data.column.field;
-            this.direction = data.order == "ascending" ? "asc" : "desc";
-    
-            this.changePage(false);
-        },
-        handleSelectionChange(val) {
-            this.multipleSelection = val;
-        },
-        handleReset(name) {
-            this.$refs[name].resetFields();
-        },
-        onDetailModalClose(refreshed) {
-            this.showModal = false;
-    
-            if(refreshed) {
-            this.changePage(false);
-            }
-        },
-        exportXls() {
-          this.changePage(this.pageIndex,true);
-        },
-    },
-    mounted: function() {
-      var self = this;
-      this.changePage(false);
-    },
-    components: {
-    }
-  };
-  </script>
-  <style lang="scss" scoped>
-  .el-breadcrumb {
-    margin: 10px;
-    line-height: 20px;
-  }
-  
-  .el-divider {
-    margin: 5px 0;
-  }
-  
-  .demo-form-inline {
-    margin-left: 10px;
-    text-align: left;
-  }
-  
-  .button-group {
-    padding: 10px;
-    text-align: left;
-  }
-  </style>