合并分支 'zax' 到 'master'

src/components/projectManagement/project/projectAdd.vue

+<template>
+  <div class="projectAdd">
+    <el-row>
+      <el-col :span="24">
+        <div class="content">
+          <p class="title">新增项目</p>
+        </div>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+export default {
+    name: 'projectAdd'
+}
+</script>
+
+<style scoped>
+  .projectAdd{
+    background: #ebf0f8;
+    width: 100%;
+  }
+  .projectAdd .content{
+    margin: 40px;
+    height: 841px;
+    background: #fff;
+    overflow: hidden;
+    cursor: default;
+  }
+  .projectAdd .content .title{
+    padding: 30px 0 0 60px;
+    font-size: 20px;
+    color: #233b6e;
+  }
+</style>
\ No newline at end of file

src/components/projectManagement/project/projectManagement.vue

+<!--项目管理-->
+<template>
+  <div class="project">
+    <el-row>
+      <el-col :span="24">
+        <div class="content">
+          <p class="title">{{pageName}}</p>
+          <p class="search">
+            <span class="searchVal">
+                <el-input v-model="searchVal" size="medium" placeholder="请输入"></el-input>
+            </span>
+            <span class="button buttonSave">搜索</span>
+            <span class="button add" @click="addProject">新增</span>
+          </p>
+          <div class="common-table">
+            <el-table
+              highlight-current-row
+              max-height="840"
+              :data="allData"
+              stripe
+              style="width: 100%;">
+              <el-table-column
+                prop="name"
+                label="项目名称"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="roleName"
+                label="当前进度"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="unitName"
+                label="开始时间"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="number"
+                label="结束时间"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="number"
+                label="建设单位"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="number"
+                label="集成商"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="number"
+                label="开发商"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="number"
+                label="监理方"
+                align="center">
+              </el-table-column>
+            </el-table>
+          </div>
+        </div>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+export default {
+    data () {
+        return {
+            searchVal: '',
+            allData: [],
+            pageName: ''
+        }
+    },
+    mounted() {
+        this.pageName = this.$store.getters.getSidebar.name;
+    },
+    methods: {
+        // 新增项目
+        addProject () {
+            this.$router.push({name: 'projectAdd'});
+        }
+    }
+}
+</script>
+
+<style scoped>
+  .project{
+    background: #ebf0f8;
+    width: 100%;
+  }
+  .project .content{
+    margin: 40px;
+    height: 841px;
+    background: #fff;
+    overflow: hidden;
+    cursor: default;
+  }
+  .project .content .title{
+    padding: 30px 0 0 60px;
+    font-size: 20px;
+    color: #233b6e;
+  }
+  .project .content .search{
+    position: relative;
+    margin-top: 36px;
+    padding: 0px 70px 0px 70px;
+    display: flex;
+  }
+  .project .content .searchVal{
+    width: 280px;
+    display: flex;
+    font-size: 18px;
+    color: #4663a6;
+  }
+  .project .content .button {
+    margin-left: 12px;
+    display: inline-block;
+    width: 100px;
+    height: 34px;
+    line-height: 34px;
+    text-align: center;
+    background: #4877e6;
+    cursor: pointer;
+    border-radius: 4px;
+    color: #fff;
+    font-size: 18px;
+  }
+  .project .content .add{
+    right: 71px;
+    position: absolute;
+  }
+  .project .content .button:hover{
+    background: rgba(72,119,230,.6);
+  }
+</style>

src/components/sidebar/sidebar.vue

@@ -184,20 +184,8 @@ export default {
                     name: '项目管理',
                     menuList: [
                         {
-                            name: '文件管理',
-                            path: 'document'
-                        }, {
-                            name: '软件清单',
-                            path: 'software'
-                        }, {
-                            name: '硬件清单',
-                            path: 'hardware'
-                        }, {
-                            name: '操作日志',
-                            path: 'journal'
-                        },{
-                            name: '技术路线',
-                            path: 'technicalRoute'
+                            name: '项目管理',
+                            path: 'projectManagement'
                         }
                     ]
                 },
@@ -205,17 +193,8 @@ export default {
                     name: '我的项目',
                     menuList: [
                         {
-                            name: '文件管理',
-                            path: 'document'
-                        }, {
-                            name: '软件清单',
-                            path: 'software'
-                        }, {
-                            name: '硬件清单',
-                            path: 'hardware'
-                        }, {
-                            name: '操作日志',
-                            path: 'journal'
+                            name: '我的项目',
+                            path: 'projectManagement'
                         }
                     ]
                 },

src/router/index.js

@@ -181,6 +181,18 @@ export default new Router({
                     name: 'technicalRoute',
                     component: resolve => require(['../components/projectManagement/technicalRoute/technicalRoute.vue'], resolve)
                 },
+                // 项目管理-项目管理首页
+                {
+                    path: '/projectManagement',
+                    name: 'projectManagement',
+                    component: resolve => require(['../components/projectManagement/project/projectManagement.vue'], resolve)
+                },
+                // 项目管理-项目新增
+                {
+                    path: '/projectAdd',
+                    name: 'projectAdd',
+                    component: resolve => require(['../components/projectManagement/project/projectAdd.vue'], resolve)
+                },
             ]
 
         }