Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop

# Conflicts:
#	src/core/lazy_use.js

package.json

@@ -62,6 +62,7 @@
     "opencollective-postinstall": "^2.0.2",
     "vue-svg-icon-loader": "^2.1.1",
     "vue-template-compiler": "^2.6.10",
-    "webpack-theme-color-replacer": "^1.3.12"
+    "webpack-theme-color-replacer": "^1.3.12",
+    "webpack": "^4.44.2"
   }
 }

public/index.html

@@ -103,6 +103,32 @@
         opacity: 1
       }
     }
+
+    /* 组织机构数选择组件样式修改 start */
+    .popover-tree>.ant-popover-content {
+      margin-top: -15px;
+      border: 1px solid #1890ff;
+      max-height: 400px;
+      overflow-y: auto;
+    }
+
+    .popover-tree>.ant-popover-content>.ant-popover-arrow {
+      display: none;
+    }
+
+    /* 组织机构数选择组件样式修改 end */
+
+    /* 项目管理 - 选择单位组件样式 start */
+    .tree-transfer .ant-transfer-list-body-customize-wrapper {
+      overflow-y: auto !important;
+      height: 500px !important;
+    }
+
+    .tree-transfer .ant-transfer-list-content {
+      height: 500px !important;
+    }
+
+    /* 项目管理 - 选择单位组件样式 end */
   </style>
   <!-- require cdn assets css -->
   <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css) { %>

src/api/project/project.js

@@ -1,7 +1,8 @@
 import request from '@/utils/request'
 
 const projectApi = {
-//   add: 'sys/menu/add',
+  add: 'project/add',
+  getDict:'projecct/getDict',
 //   get: 'sys/menu/get',
 //   update: 'sys/menu/update',
 //   del: 'sys/menu/delete',
@@ -9,13 +10,20 @@ const projectApi = {
   list: 'project/pageList'
 }
 
-// export function menuAdd (params) {
+export function projectAdd (params) {
-//   return request({
+  return request({
-//     url: menuApi.add,
+    url: projectApi.add,
-//     method: 'post',
+    method: 'post',
-//     data: params
+    data: params
-//   })
+  })
-// }
+}
+export function dictGet (params) {
+  return request({
+    url: projectApi.getDict,
+    method: 'get',
+    params: params
+  })
+}
 // export function menuGet (params) {
 //   return request({
 //     url: menuApi.get,
@@ -38,6 +46,7 @@ const projectApi = {
 //   })
 // }
 export function getProjectList (params) {
+  console.log("------------{}",params)
   return request({
     url: projectApi.list,
     method: 'get',

src/config/defaultSettings.js

@@ -14,7 +14,7 @@
 
 export default {
   navTheme: 'dark', // theme for nav menu
-  primaryColor: '#5555ff', // primary color of ant design
+  primaryColor: '#1890ff', // primary color of ant design
   layout: 'topmenu', // nav menu position: `sidemenu` or `topmenu`
   contentWidth: 'Fluid', // layout of content: `Fluid` or `Fixed`, only works when layout is topmenu
   fixedHeader: false, // sticky header

src/config/router.config.js

@@ -74,15 +74,33 @@ export const asyncRouterMap = [
       // 项目管理
       {
         path: '/project',
-        redirect: '/project/projectList',
+        redirect: '/project/list',
         component: RouteView,
         meta: { title: '项目管理', icon: bxAnaalyse, permission: ['from'] },
         children: [
           {
-            path: '/project/projectList',
+            path: '/project/list',
             name: 'projectList',
             component: () => import('@/views/project/ProjectList'),
-            meta: { title: '自主项目', keepAlive: true, permission: [ 'form' ] }
+            meta: { title: '自主项目', keepAlive: true, permission: ['form'] },
+          },
+          {
+            path: '/project/add',
+            name: 'ProjectForm',
+            component: () => import('@/views/project/ProjectForm'),
+            meta: { title: '新增项目', keepAlive: true, permission: ['form'], show: false }
+          },
+          {
+            path: '/project/addClass',
+            name: 'addClass',
+            component: () => import('@/views/project/AddClass'),
+            meta: { title: '新增种类', keepAlive: true, permission: ['form'] }
+          },
+          {
+            path: '/project/unitSelect',
+            name: 'unitSelect',
+            component: () => import('@/views/project/ProjectUnitSelect'),
+            meta: { title: '选择单位', keepAlive: true, permission: ['form'] }
           },
           {
             path: '/form/step-form',
@@ -98,6 +116,48 @@ export const asyncRouterMap = [
           }
         ]
       },
+      // 课程管理
+      {
+        path: '/courseManagement',
+        redirect: '/courseManagement/course/courseList',
+        component: RouteView,
+        meta: { title: '课程管理', icon: bxAnaalyse, permission: ['from'] },
+        children: [
+          {
+            path: '/courseManagement/course/courseList',
+            name: 'courseList',
+            component: () => import('@/views/course/CourseList'),
+            meta: { title: '系统课程', keepAlive: true, permission: ['form'] }
+          },
+          {
+            path: '/courseManagement/customCourseList',
+            name: 'customCourse',
+            component: () => import('@/views/course/customCourseList'),
+            meta: { title: '自制课程', keepAlive: true, permission: ['form'] }
+          },
+          {
+            path: '/form/advanced-form',
+            name: 'AdvanceForm',
+            component: () => import('@/views/form/advancedForm/AdvancedForm'),
+            meta: { title: '资源库', keepAlive: true, permission: ['form'] }
+          }
+        ]
+      },
+      // 档案管理
+      {
+        path: "/archives",
+        redirect: "/archives/user",
+        component: RouteView,
+        meta: { title: '档案管理', icon: 'profile', permission: ['form'] },
+        children: [
+          {
+            path: "/archives/user",
+            name: "archivesUser",
+            component: () => import('@/views/archives/user/Index'),
+            meta: { title: '人员档案', keepAlive: true, permission: ['form'] }
+          }
+        ]
+      },
       // forms
       {
         path: '/form',

src/router/index.js

@@ -12,8 +12,8 @@ Router.prototype.push = function push (location, onResolve, onReject) {
 Vue.use(Router)
 
 export default new Router({
-  mode: 'history',
+  mode: 'hash', // history
-  base: process.env.BASE_URL,
+  // base: process.env.BASE_URL,
   scrollBehavior: () => ({ y: 0 }),
   routes: constantRouterMap.concat(asyncRouterMap)
 })

src/views/project/ProjectList.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-space direction="vertical" style="width: 100%;">
+    <a-space direction="vertical" style="width: 100%">
       <a-space direction="horizontal">
         项目名:
         <a-input v-model="queryParam.projectName" style="width: 100%" />
@@ -9,12 +9,22 @@
           <a-select-option value="null">全部</a-select-option>
           <a-select-option value="1">运行中</a-select-option>
           <a-select-option value="2">已结束</a-select-option>
-          <a-select-option value="1">未发布</a-select-option>
+          <a-select-option value="3">未发布</a-select-option>
         </a-select>
         开始时间:
-        <a-date-picker v-model="queryParam.stateDate" style="width: 100%" placeholder="请输入开始时间" />
+        <a-date-picker
+          v-model="queryParam.startDate"
+          style="width: 100%"
+          placeholder="请输入开始时间"
+          valueFormat="YYYY-MM-DD HH:mm:ss"
+        />
         结束时间:
-        <a-date-picker v-model="queryParam.endDate" style="width: 100%" placeholder="请输入结束时间" />
+        <a-date-picker
+          v-model="queryParam.endDate"
+          style="width: 100%"
+          placeholder="请输入结束时间"
+          valueFormat="YYYY-MM-DD HH:mm:ss"
+        />
         培训方式:
         <a-select v-model="queryParam.trainWay" placeholder="请选择" default-value="null" style="width: 120px">
           <a-select-option value="null">全部</a-select-option>
@@ -29,40 +39,35 @@
       </a-space>
 
       <a-space direction="horizontal">
-        <a-button type="primary" icon="plus" @click="handleEdit()">新建</a-button>
+        <a-button type="primary" icon="plus" @click="handledCreate()">新建</a-button>
         <a-button type="primary" icon="minus" @click="handleEdit()">删除</a-button>
       </a-space>
 
-      <s-table ref="table" size="default" rowKey="key" :columns="columns" :data="loadData" :rowSelection="options.rowSelection">
+      <s-table
+        ref="table"
+        size="default"
+        rowKey="id"
+        :columns="columns"
+        :data="loadData"
+        :rowSelection="options.rowSelection"
+      >
         <span slot="serial" slot-scope="text, record, index">
           {{ index + 1 }}
         </span>
         <span slot="action" slot-scope="text, record">
           <template>
-            <a @click="handleEdit(record)">编辑</a>
+            <a href="javascript:;" @click="handleEdit(record)">修改</a>
+            <a-divider type="vertical" />
+            <a-popconfirm title="是否删除?" @confirm="() => handleDelete(record)">
+              <a href="javascript:;">删除</a>
+            </a-popconfirm>
+            <a-divider type="vertical" />
+            <a href="javascript:;" @click="handleDetail(record)">详情</a>
             <a-divider type="vertical" />
           </template>
-          <a-dropdown>
-            <a class="ant-dropdown-link"> 更多
-              <a-icon type="down" />
-            </a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a href="javascript:;">详情</a>
-              </a-menu-item>
-              <a-menu-item v-if="$auth('table.disable')">
-                <a href="javascript:;">禁用</a>
-              </a-menu-item>
-              <a-menu-item v-if="$auth('table.delete')">
-                <a href="javascript:;">删除</a>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
         </span>
       </s-table>
-
     </a-space>
-
   </div>
 </template>
 
@@ -70,102 +75,93 @@
 import moment from 'moment'
 import { STable } from '@/components'
 import { getProjectList } from '@/api/project/project'
+import ProjectForm from '@/views/project/ProjectForm'
+import router from '@/router/index.js'
 
 export default {
-  name: 'TableList',
+  name: 'ProjectList',
+  props: {},
   components: {
     STable,
+    ProjectForm,
+    router,
   },
   data() {
     return {
-      mdl: {},
-      // 高级搜索 展开/关闭
-      advanced: false,
       // 查询参数
       queryParam: {},
       // 表头
       columns: [
-        {
+        { title: '序号', key: 'id', dataIndex: 'id', width: 60, scopedSlots: { customRender: 'serial' } },
-          title: '序号',
+        { title: '项目名称', dataIndex: 'projectName', key: 'projectName' },
-          width: 60,
-          scopedSlots: { customRender: 'serial' },
-        },
-        {
-          title: '项目名称',
-          dataIndex: 'projectName',
-          key: 'projectName'
-        },
         {
           title: '时间',
-          dataIndex: 'description',
+          dataIndex: 'startDate',
+          key: 'startDate',
+          customRender: (text, record, index) => {
+            return record.startDate + ' - ' + record.endDate
           },
-        {
-          title: '人数',
-          dataIndex: 'callNo',
-          // sorter: true,
-          needTotal: true,
-          // customRender: (text) => text + ' 次',
-        },
-        {
-          title: '项目类型',
-          dataIndex: 'description',
         },
+        { title: '人数', key: 'personNum', dataIndex: 'personNum', customRender: (text) => text + '人' },
+        { title: '项目类型', dataIndex: 'projectType', key: 'projectType' },
         {
           title: '项目状态',
-          dataIndex: 'description',
+          dataIndex: 'status',
+          key: 'status',
+          customRender: (text, record, index) => {
+            //项目状态 1-未发布 2-未开始 3-进行中  4-已完成  5-已中止
+            if (text == 1) {
+              return '未发布'
+            }
+            if (text == 2) {
+              return '未开始'
+            }
+            if (text == 3) {
+              return '进行中'
+            }
+            if (text == 4) {
+              return '已完成'
+            }
+            if (text == 5) {
+              return '已中止'
+            }
           },
-        {
-          title: '创建人员',
-          dataIndex: 'projectStatus',
         },
-        {
+        { title: '创建人员', key: 'createBy', dataIndex: 'createBy' },
-          title: '创建时间',
+        { title: '创建时间', key: 'createDate', dataIndex: 'createDate' },
-          dataIndex: 'updatedAt',
-          sorter: true,
-        },
-        // {
-        //   title: '操作',
-        //   dataIndex: 'action',
-        //   width: '150px',
-        //   scopedSlots: { customRender: 'action' },
-        // },
         {
           title: '操作',
-          key: 'operation',
+          width: 200,
-          width: 100,
+          key: 'status',
           align: 'center',
-          scopedSlots: { customRender: 'action' }
+          scopedSlots: { customRender: 'action' },
-        }
+        },
       ],
 
       // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
+      loadData: (parameter) => {
-        return getProjectList(Object.assign(parameter, this.queryParam)).then(res => { return res; })
+        return getProjectList(Object.assign(parameter, this.queryParam)).then((res) => {
+          return res
+        })
       },
+
       selectedRowKeys: [],
       selectedRows: [],
-
-      // custom table alert & rowSelection
-      options: {
-        alert: {
-          show: true,
-          clear: () => {
-            this.selectedRowKeys = []
-          },
-        },
-        rowSelection: {
-          selectedRowKeys: this.selectedRowKeys,
-          onChange: this.onSelectChange,
-        },
-      },
-      optionAlertShow: false,
     }
   },
   created() {
     this.tableOption()
-    getRoleList({ t: new Date() })
   },
   methods: {
+    // 增
+    handledCreate() {
+      return this.$router.push(
+        // {name: 'ProjectForm'}
+        { path: 'project/project/add' }
+      )
+      // router.push()
+    },
+
     tableOption() {
       if (!this.optionAlertShow) {
         this.options = {
@@ -190,11 +186,6 @@ export default {
       }
     },
 
-    handleEdit(record) {
-      this.$emit('onEdit', record)
-    },
-    handleOk() { },
-
     onSelectChange(selectedRowKeys, selectedRows) {
       this.selectedRowKeys = selectedRowKeys
       this.selectedRows = selectedRows
@@ -211,3 +202,4 @@ export default {
   },
 }
 </script>
+

vue.config.js

@@ -31,6 +31,10 @@ const assetsCDN = {
 
 // vue.config.js
 const vueConfig = {
+  // 打包资源路径
+  publicPath: './',
+  // 输出文件目录
+  outputDir: 'dist',
   configureWebpack: {
     // webpack plugins
     plugins: [