Merge branch 'master' of git.linkerplus.com:huangwf/Property-admin

src/pages/Cleaning/index.vue

@@ -0,0 +1,49 @@
+<template>
+  <div>
+    <el-row type="flex" style="margin-top: 20px">
+      <router-link to="">
+        <el-button class="filter-item blue-black" type="primary">新增</el-button>
+      </router-link>
+    </el-row>
+    <el-table :data="tableData" border style="width: 100%; margin-top: 20px" >
+      <el-table-column prop="address" label="所属项目" align="center"></el-table-column>
+      <el-table-column prop="name" label="项目编号" align="center"></el-table-column>
+      <el-table-column prop="province" label="项目名称" align="center"></el-table-column>
+      <el-table-column prop="city" label="清洁地段" align="center"></el-table-column>
+      <el-table-column prop="date" label="清洁时间" align="center"></el-table-column>
+      <el-table-column prop="date" label="负责人  " align="center"></el-table-column>
+      <el-table-column prop="date" label="清洁内容  " align="center"></el-table-column>
+      <el-table-column fixed="right" label="操作" align="center">
+        <template scope="scope">
+        <el-button @click="handleClick(scope.row)" type="text" size="small">编辑</el-button>
+      </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  methods: {
+    handleClick(row) {
+      console.log(row);
+    }
+  },
+
+  data() {
+    return {
+      tableData: [
+        {
+          date: "2016-05-02",
+          name: "1001",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: "-",
+          remarks: "11111"
+        }
+      ]
+    };
+  }
+};
+</script>

src/pages/Customer/ContractManagement.vue

@@ -1,89 +1,4 @@
 // 合同管理
-<template>
-  <el-table
-    :data="tableData"
-    border
-    style="width: 100%">
-    <el-table-column
-      prop="address"
-      label="合同编号"
-      >
-    </el-table-column>
-    <el-table-column
-      prop="name"
-      label="地址"
-      >
-    </el-table-column>
-    <el-table-column
-      prop="province"
-      label="出租人"
-      >
-    </el-table-column>
-    <el-table-column
-      prop="city"
-      label="合同状态"
-      >
-    </el-table-column>
-    <el-table-column
-      prop="date"
-      label="签约日期"
-      >
-    </el-table-column>
-    <el-table-column
-      prop="zip"
-      label="合同终止日期"
-      >
-    </el-table-column>
-    <el-table-column
-      prop="remarks"
-      label="提前终止日期"
-      >
-    </el-table-column>
-    <el-table-column
-      prop="remarks"
-      label="收租方式"
-      >
-    </el-table-column>
-    <el-table-column
-      prop="remarks"
-      label="租金单价(/月)"
-      >
-    </el-table-column>
-    <el-table-column
-      prop="remarks"
-      label="备注"
-      >
-    </el-table-column>
-    <el-table-column
-      label="操作"
-      >
-      <template scope="">
-        <el-button type="text" size="small">编辑</el-button>
-      </template>
-    </el-table-column>
-  </el-table>
-</template>
-
-<script>
-  export default {
-    methods: {
-      handleClick(row) {
-        console.log(row);
-      }
-    },
-
-    data() {
-      return {
-        tableData: [{
-          date: '2016-05-02',
-          name: '1001',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: '-',
-          remarks: '11111'
-        }]
-      }
-    }
-  }
-</script>
+<template lang="pug">
+h1 合同管理
+</template>

src/pages/FireDrill/index.vue

@@ -0,0 +1,50 @@
+<template>
+  <div>
+    <el-row type="flex" style="margin-top: 20px">
+      <router-link to="">
+        <el-button class="filter-item blue-black" type="primary">新增</el-button>
+      </router-link>
+    </el-row>
+    <el-table :data="tableData" border style="width: 100%; margin-top: 20px" >
+      <el-table-column prop="address" label="所属项目" align="center"></el-table-column>
+      <el-table-column prop="name" label="开始时间" align="center"></el-table-column>
+      <el-table-column prop="province" label="结束时间" align="center"></el-table-column>
+      <el-table-column prop="city" label="单位" align="center"></el-table-column>
+      <el-table-column prop="date" label="参与人员" align="center"></el-table-column>
+      <el-table-column prop="date" label="演练目的  " align="center"></el-table-column>
+      <el-table-column prop="date" label="协助单位  " align="center"></el-table-column>
+      <el-table-column prop="date" label="演练结果  " align="center"></el-table-column>
+      <el-table-column fixed="right" label="操作" align="center">
+        <template scope="scope">
+        <el-button @click="handleClick(scope.row)" type="text" size="small">编辑</el-button>
+      </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  methods: {
+    handleClick(row) {
+      console.log(row);
+    }
+  },
+
+  data() {
+    return {
+      tableData: [
+        {
+          date: "2016-05-02",
+          name: "1001",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: "-",
+          remarks: "11111"
+        }
+      ]
+    };
+  }
+};
+</script>

src/pages/FireInspection/index.vue

@@ -0,0 +1,48 @@
+<template>
+  <div>
+    <el-row type="flex" style="margin-top: 20px">
+      <router-link to="">
+        <el-button class="filter-item blue-black" type="primary">新增</el-button>
+      </router-link>
+    </el-row>
+    <el-table :data="tableData" border style="width: 100%; margin-top: 20px" >
+      <el-table-column prop="address" label="所属项目" align="center"></el-table-column>
+      <el-table-column prop="name" label="巡查时间" align="center"></el-table-column>
+      <el-table-column prop="province" label="巡视人" align="center"></el-table-column>
+      <el-table-column prop="city" label="巡视地点" align="center"></el-table-column>
+      <el-table-column prop="date" label="巡视情况" align="center"></el-table-column>
+      <el-table-column prop="date" label="处理意见  " align="center"></el-table-column>
+      <el-table-column fixed="right" label="操作" align="center">
+        <template scope="scope">
+        <el-button @click="handleClick(scope.row)" type="text" size="small">编辑</el-button>
+      </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  methods: {
+    handleClick(row) {
+      console.log(row);
+    }
+  },
+
+  data() {
+    return {
+      tableData: [
+        {
+          date: "2016-05-02",
+          name: "1001",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: "-",
+          remarks: "11111"
+        }
+      ]
+    };
+  }
+};
+</script>

src/pages/Staff/StaffInfo/index.vue

@@ -0,0 +1,64 @@
+<template>
+  <div class="app-container">
+    <div class="filter-container">
+      <el-row type="flex" justify="end">
+        <el-col :md="2" :xs="24" class="left-align">
+          <el-button class="filter-item blue-black" type="primary" icon="el-icon-search">新增</el-button>
+        </el-col>
+        <el-col :md="22" :xs="24" style="flost: right">
+          <el-input v-model="search" :placeholder="'搜索'" style="width: 200px;" clearable />
+          <el-button class="filter-item blue-black" type="primary" icon="el-icon-search">查询</el-button>
+        </el-col>
+      </el-row>
+    </div>
+
+    <el-table
+      :data="tableData"
+      border
+      style="width: 100%">
+      <el-table-column prop="data1" label="用户" ></el-table-column>
+      <el-table-column prop="data2" label="昵称" ></el-table-column>
+      <el-table-column prop="data3" label="所属" ></el-table-column>
+      <el-table-column prop="data4" label="账号类型" ></el-table-column>
+      <el-table-column prop="data5" label="用户组" ></el-table-column>
+      <el-table-column prop="data6" label="最后登录时间" ></el-table-column>
+      <el-table-column prop="data7" label="登录次数" ></el-table-column>
+      <el-table-column prop="data8" label="状态" ></el-table-column>
+      <el-table-column label="操作" >
+        <template scope="scope">
+          <el-button type="text" size="small" @click="handleClick(scope.row)">编辑</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+  export default {
+    methods: {
+      handleClick(row) {
+        console.log(row);
+      }
+    },
+
+    data() {
+      return {
+        search: null,
+        tableData: [{
+          data1: '小明',
+          data2: '小明',
+          data3: '上海',
+          data4: '小区',
+          data5: '财务',
+          data6: '2019-11-06 17:12',
+          data7: 23,
+          data8: '正常'
+        }]
+      }
+    },
+
+    methods: {
+      handleClick(val) {}
+    }
+  }
+</script>

src/pages/Staff/StaffJurisdiction/index.vue

@@ -0,0 +1,52 @@
+<template>
+  <div class="app-container">
+    <div class="filter-container">
+      <el-row type="flex" justify="end">
+        <el-col :md="2" :xs="24" class="left-align">
+          <el-button class="filter-item blue-black" type="primary" icon="el-icon-search">新增</el-button>
+        </el-col>
+        <el-col :md="22" :xs="24" style="flost: right">
+          <el-input v-model="search" :placeholder="'搜索'" style="width: 200px;" clearable />
+          <el-button class="filter-item blue-black" type="primary" icon="el-icon-search">查询</el-button>
+        </el-col>
+      </el-row>
+    </div>
+
+    <el-table
+      :data="tableData"
+      border
+      style="width: 100%">
+      <el-table-column prop="data1" label="用户" ></el-table-column>
+      <el-table-column prop="data2" label="拥有权限" ></el-table-column>
+      <el-table-column label="操作" >
+        <template scope="scope">
+          <el-button type="text" size="small" @click="handleClick(scope.row)">编辑</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+  export default {
+    methods: {
+      handleClick(row) {
+        console.log(row);
+      }
+    },
+
+    data() {
+      return {
+        search: null,
+        tableData: [{
+          data1: '小明',
+          data2: '财务新增、财务删除、财务修改、财务查询'
+        }]
+      }
+    },
+
+    methods: {
+      handleClick(val) {}
+    }
+  }
+</script>

src/router/index.js

@@ -60,12 +60,22 @@ import DataDictionary           from '@/pages/System/DataDictionary'
 import OperationLog             from '@/pages/System/OperationLog'                                      // 操作日志
 
 import Complaints from '@/pages/Complaints/index'
+import StaffInfo from '@/pages/Staff/StaffInfo/index'
 import ParKing from '@/pages/ParKing/index' //停车位
+import StaffJurisdiction from '@/pages/Staff/StaffJurisdiction/index'
 import Letter from '@/pages/Letter/index' //收信记录
 import Security from '@/pages/SecurityFire/Security/index' //保安安排
 import Duty from '@/pages/SecurityFire/Duty/index' //执勤管理
 import Visit from '@/pages/SecurityFire/Visit/index' //来访管理
 
+import Vehicle from '@/pages/Vehicle/index'                                     //车辆管理
+import Architecture from '@/pages/Architecture/index'                                     //房屋架构
+
+import FireInspection from '@/pages/FireInspection/index'                  //消防巡查
+import FireDrill from '@/pages/FireDrill/index'                  //消防演练
+import Cleaning from '@/pages/Cleaning/index'                  //保洁安排
+
+
 Vue.use( Router )
 
 export default new Router({
@@ -139,7 +149,7 @@ export default new Router({
                     components: {
                         ContainerView: WaterFeeEntry
                     }
-                }, 
+                },
                 // 客户管理
                 {
                     path: '/CustomerInformation',
@@ -285,18 +295,53 @@ export default new Router({
                         ContainerView: Complaints
                     }
                 },
-                //停车位
+                // 车辆管理
+                {
+                    path: '/Vehicle',
+                    components: {
+                        ContainerView: Vehicle
+                    }
+                },
+                // 房屋架构
+                {
+                    path: '/Architecture',
+                    components: {
+                        ContainerView: Architecture
+                    }
+                },
+                // 员工信息
+                {
+                    path: '/StaffInfo',
+                    components: {
+                        ContainerView: StaffInfo
+                    }
+                },
+                // 员工权限管理
+                {
+                    path: '/StaffJurisdiction',
+                    components: {
+                        ContainerView: StaffJurisdiction
+                    }
+                },
+                // 消防巡查
+                {
+                    path: '/FireInspection',
+                    components: {
+                        ContainerView: FireInspection
+                    }
+                },
+                // 消防演练
                 {
-                    path: '/ParKing',
+                    path: '/FireDrill',
                     components: {
-                        ContainerView: ParKing
+                        ContainerView: FireDrill
                     }
                 },
-                //收信记录
+                // 保洁安排
                 {
-                    path: '/Letter',
+                    path: '/Cleaning',
                     components: {
-                        ContainerView: Letter
+                        ContainerView: Cleaning
                     }
                 },
                 //保安安排

static/api/viewAPI.json

@@ -12,11 +12,11 @@
                         {
                             "titleName"     : "应收查询",
                             "url"           : "RentQuery",
-                            "breadcrumb"    : [ "收费管理", "租金管理", "应收查询" ] 
+                            "breadcrumb"    : [ "收费管理", "租金管理", "应收查询" ]
                         }, {
                             "titleName"     : "租金记录",
                             "url"           : "RentRecord",
-                            "breadcrumb"    : [ "收费管理", "租金管理", "租金记录" ] 
+                            "breadcrumb"    : [ "收费管理", "租金管理", "租金记录" ]
                         }
                     ]
                 }, {
@@ -25,11 +25,11 @@
                         {
                             "titleName"     : "物业费查询",
                             "url"           : "PropertyQuery",
-                            "breadcrumb"    : [ "收费管理", "物业收费", "物业费查询" ] 
+                            "breadcrumb"    : [ "收费管理", "物业收费", "物业费查询" ]
                         }, {
                             "titleName"     : "物业费记录",
                             "url"           : "PropertyRecord",
-                            "breadcrumb"    : [ "收费管理", "物业收费", "物业费记录" ] 
+                            "breadcrumb"    : [ "收费管理", "物业收费", "物业费记录" ]
                         }
                     ]
                 }, {
@@ -38,19 +38,19 @@
                         {
                             "titleName"     : "电费查询",
                             "url"           : "ElectricityBillQuery",
-                            "breadcrumb"    : [ "收费管理", "抄表电费", "电费查询" ] 
+                            "breadcrumb"    : [ "收费管理", "抄表电费", "电费查询" ]
                         }, {
                             "titleName"     : "电费记录",
                             "url"           : "ElectricityBillRecord",
-                            "breadcrumb"    : [ "收费管理", "抄表电费", "电费记录" ] 
+                            "breadcrumb"    : [ "收费管理", "抄表电费", "电费记录" ]
                         }, {
                             "titleName"     : "电费录入",
                             "url"           : "ElectricityBillEntry",
-                            "breadcrumb"    : [ "收费管理", "抄表电费", "电费录入" ] 
+                            "breadcrumb"    : [ "收费管理", "抄表电费", "电费录入" ]
                         }, {
                             "titleName"     : "峰平谷录入",
                             "url"           : "PeakflatvalleyEntry",
-                            "breadcrumb"    : [ "收费管理", "抄表电费", "峰平谷录入" ] 
+                            "breadcrumb"    : [ "收费管理", "抄表电费", "峰平谷录入" ]
                         }
                     ]
                 }, {
@@ -59,15 +59,15 @@
                         {
                             "titleName"     : "水费查询",
                             "url"           : "WaterFeeQuery",
-                            "breadcrumb"    : [ "收费管理", "抄表水费", "水费查询" ] 
+                            "breadcrumb"    : [ "收费管理", "抄表水费", "水费查询" ]
                         }, {
                             "titleName"     : "水费记录",
                             "url"           : "WaterFeeRecord",
-                            "breadcrumb"    : [ "收费管理", "抄表水费", "水费记录" ] 
+                            "breadcrumb"    : [ "收费管理", "抄表水费", "水费记录" ]
                         }, {
                             "titleName"     : "水表录入",
                             "url"           : "WaterFeeEntry",
-                            "breadcrumb"    : [ "收费管理", "抄表水费", "水费录入" ] 
+                            "breadcrumb"    : [ "收费管理", "抄表水费", "水费录入" ]
                         }
                     ]
                 }
@@ -162,7 +162,7 @@
                             "url"           : "WaterFee",
                             "breadcrumb"    : [ "财务管理", "统计报表", "抄表水费" ]
                         }
-                    ]                       
+                    ]
                 }, {
                     "titleName" : "租赁审核",
                     "bottom"    : [
@@ -257,23 +257,68 @@
                 }
             ]
         }, {
-            "titleName": "车位区域管理",
+            "titleName": "车辆管理",
+            "iconClass": "settings_applications",
+            "middleLink": [
+                {
+                    "titleName" : "车辆管理",
+                    "url"       : "Vehicle",
+                    "breadcrumb": [ "车辆管理" ]
+                }
+            ]
+        }, {
+            "titleName": "员工管理",
+            "iconClass": "settings_applications",
+            "middleLink": [
+                {
+                    "titleName" : "员工信息",
+                    "url"       : "StaffInfo",
+                    "breadcrumb": [ "员工信息" ]
+                },
+                {
+                    "titleName" : "员工权限管理",
+                    "url"       : "StaffJurisdiction",
+                    "breadcrumb": [ "员工权限管理" ]
+                }
+            ]
+        }, {
+            "titleName": "房屋架构",
+            "iconClass": "settings_applications",
+            "middleLink": [
+                {
+                    "titleName" : "房屋架构",
+                    "url"       : "Architecture",
+                    "breadcrumb": [ "房屋架构" ]
+                }
+            ]
+        }, {
+            "titleName": "消防巡查",
+            "iconClass": "settings_applications",
+            "middleLink": [
+                {
+                    "titleName" : "消防巡查",
+                    "url"       : "FireInspection",
+                    "breadcrumb": [ "消防巡查" ]
+                }
+            ]
+        }, {
+            "titleName": "消防演练",
             "iconClass": "settings_applications",
             "middleLink": [
                 {
-                    "titleName" : "车位区域管理",
-                    "url"       : "ParKing",
-                    "breadcrumb": [ "车位区域管理" ]
+                    "titleName" : "消防演练",
+                    "url"       : "FireDrill",
+                    "breadcrumb": [ "消防演练" ]
                 }
             ]
         }, {
-            "titleName": "收信记录",
+            "titleName": "保洁安排",
             "iconClass": "settings_applications",
             "middleLink": [
                 {
-                    "titleName" : "收信记录",
-                    "url"       : "Letter",
-                    "breadcrumb": [ "收信记录" ]
+                    "titleName" : "保洁安排",
+                    "url"       : "Cleaning",
+                    "breadcrumb": [ "保洁安排" ]
                 }
             ]
         }, {
@@ -297,4 +342,4 @@
             ]
         }
     ]
-}
+}