ui页面修改以及页面跳转增加

package-lock.json

@@ -10,6 +10,7 @@
       "dependencies": {
         "axios": "^0.21.1",
         "core-js": "^3.6.5",
+        "echarts": "^5.1.2",
         "element-ui": "^2.9.2",
         "jquery": "^3.6.0",
         "js-cookie": "3.0.0",
@@ -6059,6 +6060,15 @@
         "safer-buffer": "^2.1.0"
       }
     },
+    "node_modules/echarts": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.1.2.tgz",
+      "integrity": "sha512-okUhO4sw22vwZp+rTPNjd/bvTdpug4K4sHNHyrV8NdAncIX9/AarlolFqtJCAYKGFYhUBNjIWu1EznFrSWTFxg==",
+      "dependencies": {
+        "tslib": "2.0.3",
+        "zrender": "5.1.1"
+      }
+    },
     "node_modules/ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.nlark.com/ee-first/download/ee-first-1.1.1.tgz",
@@ -14355,6 +14365,11 @@
         }
       }
     },
+    "node_modules/tslib": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
+      "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="
+    },
     "node_modules/tty-browserify": {
       "version": "0.0.0",
       "resolved": "https://registry.npm.taobao.org/tty-browserify/download/tty-browserify-0.0.0.tgz",
@@ -16231,6 +16246,14 @@
       "engines": {
         "node": ">=10"
       }
+    },
+    "node_modules/zrender": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.1.1.tgz",
+      "integrity": "sha512-oeWlmUZPQdS9f5hK4pV21tHPqA3wgQ7CkKkw7l0CCBgWlJ/FP+lRgLFtUBW6yam4JX8y9CdHJo1o587VVrbcoQ==",
+      "dependencies": {
+        "tslib": "2.0.3"
+      }
     }
   },
   "dependencies": {
@@ -20955,6 +20978,15 @@
         "safer-buffer": "^2.1.0"
       }
     },
+    "echarts": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.1.2.tgz",
+      "integrity": "sha512-okUhO4sw22vwZp+rTPNjd/bvTdpug4K4sHNHyrV8NdAncIX9/AarlolFqtJCAYKGFYhUBNjIWu1EznFrSWTFxg==",
+      "requires": {
+        "tslib": "2.0.3",
+        "zrender": "5.1.1"
+      }
+    },
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.nlark.com/ee-first/download/ee-first-1.1.1.tgz",
@@ -27636,6 +27668,11 @@
       "integrity": "sha1-pQCtCEsHmPHDBxrzkeZZEshrypI=",
       "dev": true
     },
+    "tslib": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
+      "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="
+    },
     "tty-browserify": {
       "version": "0.0.0",
       "resolved": "https://registry.npm.taobao.org/tty-browserify/download/tty-browserify-0.0.0.tgz",
@@ -29148,6 +29185,14 @@
       "version": "20.2.9",
       "resolved": "https://registry.nlark.com/yargs-parser/download/yargs-parser-20.2.9.tgz",
       "integrity": "sha1-LrfcOwKJcY/ClfNidThFxBoMlO4="
+    },
+    "zrender": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.1.1.tgz",
+      "integrity": "sha512-oeWlmUZPQdS9f5hK4pV21tHPqA3wgQ7CkKkw7l0CCBgWlJ/FP+lRgLFtUBW6yam4JX8y9CdHJo1o587VVrbcoQ==",
+      "requires": {
+        "tslib": "2.0.3"
+      }
     }
   }
 }

package.json

@@ -10,6 +10,7 @@
   "dependencies": {
     "axios": "^0.21.1",
     "core-js": "^3.6.5",
+    "echarts": "^5.1.2",
     "element-ui": "^2.9.2",
     "jquery": "^3.6.0",
     "js-cookie": "3.0.0",

src/assets/icon/iconfont.css

 @font-face {
   font-family: "iconfont"; /* Project id 2766225 */
-  src: url('iconfont.woff2?t=1629943279368') format('woff2'),
-       url('iconfont.woff?t=1629943279368') format('woff'),
-       url('iconfont.ttf?t=1629943279368') format('truetype');
+  src: url('iconfont.woff2?t=1630403828082') format('woff2'),
+       url('iconfont.woff?t=1630403828082') format('woff'),
+       url('iconfont.ttf?t=1630403828082') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-ren-pingbi:before {
+  content: "\e705";
+}
+
+.icon-shezhi:before {
+  content: "\e611";
+}
+
 .icon-dian:before {
   content: "\e605";
 }

src/assets/icon/iconfont.json

@@ -5,6 +5,20 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "9974426",
+      "name": "人-屏蔽",
+      "font_class": "ren-pingbi",
+      "unicode": "e705",
+      "unicode_decimal": 59141
+    },
+    {
+      "icon_id": "10262050",
+      "name": "设 置",
+      "font_class": "shezhi",
+      "unicode": "e611",
+      "unicode_decimal": 58897
+    },
     {
       "icon_id": "15162652",
       "name": "dian",

src/router/index.js

@@ -9,33 +9,47 @@ import mineMonitoring from '../views/mineMonitoring.vue'
 //视频监控
 import videoSurveillance from '../views/videoSurveillance.vue'
 //生产自动化系统
-import AutomationHomepage from '../views/AutomationHomepage.vue'
-import AutomatedNowData from '../views/AutomatedNowData.vue'
-import AutomationHistory from '../views/AutomationHistory.vue'
-import AutomaticAlarm from '../views/AutomaticAlarm.vue'
-//生产报表系统
-import ReportHomePage from '../views/ReportHomePage.vue'
-import ReportNowData from '../views/ReportNowData.vue'
-import ReportHistory from '../views/ReportHistory.vue'
+import AutomationHomepage from '../views/productionAutomation/AutomationHomepage.vue'
+import AutomatedReport from '../views/productionAutomation/AutomatedReport.vue'
 //人员定位系统
-import PersonnelPositioning from '../views/PersonnelPositioning.vue'
+import PersonnelPositioningHomePage from '../views/personnelPositioning/homePage.vue'
+import PersonnelPositioningNowData from '../views/personnelPositioning/nowData.vue'
+import PersonnelPositioningTrajectory from '../views/personnelPositioning/trajectory.vue'
+import PersonnelPositioningHistroyData from '../views/personnelPositioning/histroyData.vue'
+import PersonnelPositioningAlarm from '../views/personnelPositioning/alarm.vue'
+import PersonnelPositioningEnclosure from '../views/personnelPositioning/enclosure.vue'
+import PersonnelPositioningRegister from '../views/personnelPositioning/register.vue'
+//车辆定位系统
+import carPositioningHomePage from '../views/carPositioning/homePage.vue'
+import carPositioningNowData from '../views/carPositioning/nowData.vue'
+import carPositioningTrajectory from '../views/carPositioning/trajectory.vue'
+import carPositioningHistroyData from '../views/carPositioning/histroyData.vue'
+import carPositioningAlarm from '../views/carPositioning/alarm.vue'
+import carPositioningEnclosure from '../views/carPositioning/enclosure.vue'
+import carPositioningRegister from '../views/carPositioning/register.vue'
 //边坡在线监测
-import SlopeHomePage from '../views/SlopeHomePage.vue'
-import SlopeNowData from '../views/SlopeNowData.vue'
-import SlopeHistory from '../views/SlopeHistory.vue'
-import SlopeAlarm from '../views/SlopeAlarm.vue'
+import SlopeHomePage from '../views/slope/homePage.vue'
+import SlopeHorizontal from '../views/slope/horizontal.vue'
+import SlopeVertical from '../views/slope/vertical.vue'
+import SlopeRainfall from '../views/slope/rainfall.vue'
+import SlopeEarlyWarning from '../views/slope/earlyWarning.vue'
+import SlopeHistory from '../views/slope/historyData.vue'
+import SlopeAlarm from '../views/slope/alarm.vue'
 //环境在线监测
-import EnvironmentHomepage from '../views/EnvironmentHomepage.vue'
-import EnvironmentNowData from '../views/EnvironmentNowData.vue'
-import EnvironmentHistory from '../views/EnvironmentHistory.vue'
-import EnvironmentAlarm from '../views/EnvironmentAlarm.vue'
+import EnvironmentHomepage from '../views/environment/homepage.vue'
+import EnvironmentNowData from '../views/environment/nowData.vue'
+import EnvironmentHistory from '../views/environment/history.vue'
+import EnvironmentAlarm from '../views/environment/alarm.vue'
 //数字化储量管理
-import reservesHomepage from '../views/reservesHomepage.vue'
+import reservesHomepage from '../views/reserves/homepage.vue'
+import reservesList from '../views/reserves/list.vue'
 //门禁系统
 import AccessHomepage from '../views/AccessHomepage.vue'
+//无人值守
+import unman from '../views/unman.vue'
 //系统管理
-import PersonManagement from '../views/PersonManagement.vue'
-import carManagement from '../views/carManagement.vue'
+import personManagement from '../views/management/person.vue'
+import carManagement from '../views/management/car.vue'
 
 Vue.use(VueRouter)
 //解决vue中路由冗余导航报错
@@ -71,43 +85,95 @@ const routes = [
       {
         path: '/homepage/AutomationHomepage',
         component: AutomationHomepage
-      },{
-        path: '/homepage/AutomatedNowData',
-        component: AutomatedNowData
-      },{
-        path: '/homepage/AutomationHistory',
-        component: AutomationHistory
-      },{
-        path: '/homepage/AutomaticAlarm',
-        component: AutomaticAlarm
       },
-      //生产报表系统
       {
-        path: '/homepage/ReportHomePage',
-        component: ReportHomePage
-      },{
-        path: '/homepage/ReportNowData',
-        component: ReportNowData
-      },{
-        path: '/homepage/ReportHistory',
-        component: ReportHistory
+        path: '/homepage/AutomatedReport',
+        component: AutomatedReport
       },
       //人员定位系统
       {
-        path: '/homepage/PersonnelPositioning',
-        component: PersonnelPositioning
+        path: '/homepage/PersonnelPositioningHomePage',
+        component: PersonnelPositioningHomePage
+      },
+      {
+        path: '/homepage/PersonnelPositioningNowData',
+        component: PersonnelPositioningNowData
+      },
+      {
+        path: '/homepage/PersonnelPositioningTrajectory',
+        component: PersonnelPositioningTrajectory
+      },
+      {
+        path: '/homepage/PersonnelPositioningHistroyData',
+        component: PersonnelPositioningHistroyData
+      },
+      {
+        path: '/homepage/PersonnelPositioningAlarm',
+        component: PersonnelPositioningAlarm
+      },
+      {
+        path: '/homepage/PersonnelPositioningEnclosure',
+        component: PersonnelPositioningEnclosure
+      },
+      {
+        path: '/homepage/PersonnelPositioningRegister',
+        component: PersonnelPositioningRegister
+      },
+      //车辆定位系统
+      {
+        path: '/homepage/carPositioningHomePage',
+        component: carPositioningHomePage
+      },
+      {
+        path: '/homepage/carPositioningNowData',
+        component: carPositioningNowData
+      },
+      {
+        path: '/homepage/carPositioningTrajectory',
+        component: carPositioningTrajectory
+      },
+      {
+        path: '/homepage/carPositioningHistroyData',
+        component: carPositioningHistroyData
+      },
+      {
+        path: '/homepage/carPositioningAlarm',
+        component: carPositioningAlarm
+      },
+      {
+        path: '/homepage/carPositioningEnclosure',
+        component: carPositioningEnclosure
+      },
+      {
+        path: '/homepage/carPositioningRegister',
+        component: carPositioningRegister
       },
       //边坡在线监测
       {
         path: '/homepage/SlopeHomePage',
         component: SlopeHomePage
-      },{
-        path: '/homepage/SlopeNowData',
-        component: SlopeNowData
-      },{
+      },
+      {
+        path: '/homepage/SlopeHorizontal',
+        component: SlopeHorizontal
+      },
+      {
+        path: '/homepage/SlopeVertical',
+        component: SlopeVertical
+      },
+      {
+        path: '/homepage/SlopeRainfall',
+        component: SlopeRainfall
+      },
+      {
+        path: '/homepage/SlopeEarlyWarning',
+        component: SlopeEarlyWarning
+      },
+      {
         path: '/homepage/SlopeHistory',
         component: SlopeHistory
-      },{
+      },
+      {
         path: '/homepage/SlopeAlarm',
         component: SlopeAlarm
       },
@@ -130,15 +196,24 @@ const routes = [
         path: '/homepage/reservesHomepage',
         component: reservesHomepage
       },
+      {
+        path: '/homepage/reservesList',
+        component: reservesList
+      },
       //门禁系统
       {
         path: '/homepage/AccessHomepage',
         component: AccessHomepage
       },
+      //无人值守
+      {
+        path: '/homepage/unman',
+        component: unman
+      },
       //系统管理
       {
-        path: '/homepage/PersonManagement',
-        component: PersonManagement
+        path: '/homepage/personManagement',
+        component: personManagement
       },
       {
         path: '/homepage/carManagement',

src/store/index.js

@@ -40,196 +40,7 @@ const mineMonitoring = {
 //生产自动化系统模块
 const automation = {
 	state:{
-    //系统首页
-	  brieflyMenuBar:{
-      context:[{name:"破碎机1",context:"正常"},
-               {name:"破碎机2",context:"正常"},
-               {name:"通风除尘1",context:"正常"},
-               {name:"通风除尘2",context:"正常"},
-               {name:"通风除尘3",context:"正常"},
-               {name:"通风除尘4",context:"正常"},
-      ],
-    },
-    //历史数据
-    history:{
-      tableData: [{
-        equipment: '2016-05-02',
-        name: '王小虎',
-        numerical: '上海市普陀区金沙江路 1518 弄',
-        alarmLevel: '2016-05-02',
-        time: '王小虎',
-        status: '上海市普陀区金沙江路 1518 弄'
-      },{
-        equipment: '2016-05-02',
-        name: '王小虎',
-        numerical: '上海市普陀区金沙江路 1518 弄',
-        alarmLevel: '2016-05-02',
-        time: '王小虎',
-        status: '上海市普陀区金沙江路 1518 弄'
-      },{
-        equipment: '2016-05-02',
-        name: '王小虎',
-        numerical: '上海市普陀区金沙江路 1518 弄',
-        alarmLevel: '2016-05-02',
-        time: '王小虎',
-        status: '上海市普陀区金沙江路 1518 弄'
-      },{
-        equipment: '2016-05-02',
-        name: '王小虎',
-        numerical: '上海市普陀区金沙江路 1518 弄',
-        alarmLevel: '2016-05-02',
-        time: '王小虎',
-        status: '上海市普陀区金沙江路 1518 弄'
-      },{
-        equipment: '2016-05-02',
-        name: '王小虎',
-        numerical: '上海市普陀区金沙江路 1518 弄',
-        alarmLevel: '2016-05-02',
-        time: '王小虎',
-        status: '上海市普陀区金沙江路 1518 弄'
-      },{
-        equipment: '2016-05-02',
-        name: '王小虎',
-        numerical: '上海市普陀区金沙江路 1518 弄',
-        alarmLevel: '2016-05-02',
-        time: '王小虎',
-        status: '上海市普陀区金沙江路 1518 弄'
-      },{
-        equipment: '2016-05-02',
-        name: '王小虎',
-        numerical: '上海市普陀区金沙江路 1518 弄',
-        alarmLevel: '2016-05-02',
-        time: '王小虎',
-        status: '上海市普陀区金沙江路 1518 弄'
-      },{
-        equipment: '2016-05-02',
-        name: '王小虎',
-        numerical: '上海市普陀区金沙江路 1518 弄',
-        alarmLevel: '2016-05-02',
-        time: '王小虎',
-        status: '上海市普陀区金沙江路 1518 弄'
-      },]
-    },
-    //实时数据
-    now:{
-      tableData: [{
-        equipment: '2016-05-02',
-        name: '王小虎',
-        numerical: '上海市普陀区金沙江路 1518 弄',
-        alarmLevel: '2016-05-02',
-        time: '王小虎',
-        status: '上海市普陀区金沙江路 1518 弄'
-      },{
-        equipment: '2016-05-02',
-        name: '王小虎',
-        numerical: '上海市普陀区金沙江路 1518 弄',
-        alarmLevel: '2016-05-02',
-        time: '王小虎',
-        status: '上海市普陀区金沙江路 1518 弄'
-      },{
-        equipment: '2016-05-02',
-        name: '王小虎',
-        numerical: '上海市普陀区金沙江路 1518 弄',
-        alarmLevel: '2016-05-02',
-        time: '王小虎',
-        status: '上海市普陀区金沙江路 1518 弄'
-      },{
-        equipment: '2016-05-02',
-        name: '王小虎',
-        numerical: '上海市普陀区金沙江路 1518 弄',
-        alarmLevel: '2016-05-02',
-        time: '王小虎',
-        status: '上海市普陀区金沙江路 1518 弄'
-      },{
-        equipment: '2016-05-02',
-        name: '王小虎',
-        numerical: '上海市普陀区金沙江路 1518 弄',
-        alarmLevel: '2016-05-02',
-        time: '王小虎',
-        status: '上海市普陀区金沙江路 1518 弄'
-      },{
-        equipment: '2016-05-02',
-        name: '王小虎',
-        numerical: '上海市普陀区金沙江路 1518 弄',
-        alarmLevel: '2016-05-02',
-        time: '王小虎',
-        status: '上海市普陀区金沙江路 1518 弄'
-      },{
-        equipment: '2016-05-02',
-        name: '王小虎',
-        numerical: '上海市普陀区金沙江路 1518 弄',
-        alarmLevel: '2016-05-02',
-        time: '王小虎',
-        status: '上海市普陀区金沙江路 1518 弄'
-      },{
-        equipment: '2016-05-02',
-        name: '王小虎',
-        numerical: '上海市普陀区金沙江路 1518 弄',
-        alarmLevel: '2016-05-02',
-        time: '王小虎',
-        status: '上海市普陀区金沙江路 1518 弄'
-      },]
-    },
-    //报警记录
-    alarm:{
-      tableData: [{
-        equipment: '2016-05-02',
-        name: '王小虎',
-        numerical: '上海市普陀区金沙江路 1518 弄',
-        alarmLevel: '2016-05-02',
-        time: '王小虎',
-        status: '上海市普陀区金沙江路 1518 弄'
-      },{
-        equipment: '2016-05-02',
-        name: '王小虎',
-        numerical: '上海市普陀区金沙江路 1518 弄',
-        alarmLevel: '2016-05-02',
-        time: '王小虎',
-        status: '上海市普陀区金沙江路 1518 弄'
-      },{
-        equipment: '2016-05-02',
-        name: '王小虎',
-        numerical: '上海市普陀区金沙江路 1518 弄',
-        alarmLevel: '2016-05-02',
-        time: '王小虎',
-        status: '上海市普陀区金沙江路 1518 弄'
-      },{
-        equipment: '2016-05-02',
-        name: '王小虎',
-        numerical: '上海市普陀区金沙江路 1518 弄',
-        alarmLevel: '2016-05-02',
-        time: '王小虎',
-        status: '上海市普陀区金沙江路 1518 弄'
-      },{
-        equipment: '2016-05-02',
-        name: '王小虎',
-        numerical: '上海市普陀区金沙江路 1518 弄',
-        alarmLevel: '2016-05-02',
-        time: '王小虎',
-        status: '上海市普陀区金沙江路 1518 弄'
-      },{
-        equipment: '2016-05-02',
-        name: '王小虎',
-        numerical: '上海市普陀区金沙江路 1518 弄',
-        alarmLevel: '2016-05-02',
-        time: '王小虎',
-        status: '上海市普陀区金沙江路 1518 弄'
-      },{
-        equipment: '2016-05-02',
-        name: '王小虎',
-        numerical: '上海市普陀区金沙江路 1518 弄',
-        alarmLevel: '2016-05-02',
-        time: '王小虎',
-        status: '上海市普陀区金沙江路 1518 弄'
-      },{
-        equipment: '2016-05-02',
-        name: '王小虎',
-        numerical: '上海市普陀区金沙江路 1518 弄',
-        alarmLevel: '2016-05-02',
-        time: '王小虎',
-        status: '上海市普陀区金沙江路 1518 弄'
-      },]
-    },
+  
 	},
 	mutations:{
 	

src/views/AutomationHistory.vue

-<template>
-  <div class="AuHiViewBody">
-
-    <div class="AuHiTop">
-      <div style="font-size:20px;font-weight:600;">历史数据查询搜索</div>
-      <div style="margin-top:10px;display:flex;">
-        <div>
-          <template>
-            <el-select v-model="feijishebei.value" placeholder="请选择风机设备">
-              <el-option
-                v-for="item in feijishebei.options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-              </el-option>
-            </el-select>
-          </template>
-        </div>
-        <div style="margin-left:20px;">
-          <template>
-            <el-select v-model="jiancexiang.value" placeholder="请选择监测项">
-              <el-option
-                v-for="item in jiancexiang.options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-              </el-option>
-            </el-select>
-          </template>
-        </div>
-        <div style="margin-left:20px;">
-          <template>
-              <el-date-picker
-                v-model="selectDate1.value"
-                type="daterange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期">
-              </el-date-picker>
-          </template>
-        </div>
-        <div style="margin:0px 20px;">
-          <template>
-              <el-date-picker
-                v-model="selectDate2.value"
-                type="daterange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期">
-              </el-date-picker>
-          </template>
-        </div>
-        <el-button type="primary" icon="el-icon-upload2" @click="daochu()">导出</el-button>
-        <el-button icon="el-icon-printer" @click="dayin()">打印</el-button>
-      </div>
-    </div>
-
-    <div class="AuHiBottom">
-      <template>
-        <el-table :data="historyData" height="700" border style="width: 100%" :row-style="tableRowStyle">
-          <el-table-column prop="equipment" label="产品设备" align="center"></el-table-column>
-          <el-table-column prop="name" label="指标名称" align="center"></el-table-column>
-          <el-table-column prop="numerical" label="数值" align="center"></el-table-column>
-          <el-table-column prop="alarmLevel" label="报警级别" align="center"></el-table-column>
-          <el-table-column prop="time" label="时间" align="center"></el-table-column>
-          <el-table-column prop="status" label="处理状态" align="center"></el-table-column>
-        </el-table>
-      </template>
-    </div>
-
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      feijishebei:{
-        options: [{
-          value: '1号风机设备',
-          label: '1号风机设备'
-        }, {
-          value: '2号风机设备',
-          label: '2号风机设备'
-        }, {
-          value: '3号风机设备',
-          label: '3号风机设备'
-        }, {
-          value: '4号风机设备',
-          label: '4号风机设备'
-        }, {
-          value: '5号风机设备',
-          label: '5号风机设备'
-        }],
-        value: ''
-      },
-      jiancexiang:{
-        options: [{
-          value: '选项1',
-          label: '黄金糕'
-        }, {
-          value: '选项2',
-          label: '双皮奶'
-        }, {
-          value: '选项3',
-          label: '蚵仔煎'
-        }, {
-          value: '选项4',
-          label: '龙须面'
-        }, {
-          value: '选项5',
-          label: '北京烤鸭'
-        }],
-        value: ''
-      },
-      selectDate1:{
-        value:""
-      },
-      selectDate2:{
-        value:""
-      },
-      historyData:this.$store.state.b.history.tableData,
-    }
-  },
-  methods:{
-    tableRowStyle({row, rowIndex}) {
-      // if (row.name == "王小虎") {
-      //   return 'background: rgb(255,232,232);';
-      // }
-    },
-    daochu(){
-      //获取表格
-      var exportFileContent = document.querySelector(".el-table").outerHTML;           
-      //设置格式为Excel，表格内容通过btoa转化为base64，此方法只在文件较小时使用(小于1M)
-      //exportFileContent=window.btoa(unescape(encodeURIComponent(exportFileContent)));
-      //var link = "data:"+MIMEType+";base64," + exportFileContent;
-      //使用Blob
-      var blob = new Blob([exportFileContent], {type: "text/plain;charset=utf-8"});     	//解决中文乱码问题
-      blob =  new Blob([String.fromCharCode(0xFEFF), blob], {type: blob.type});
-      //设置链接
-      var link = window.URL.createObjectURL(blob); 
-      var a = document.createElement("a");    //创建a标签
-      a.download = "生产自动化系统历史数据表.xls";  //设置被下载的超链接目标（文件名）
-      a.href = link;                            //设置a标签的链接
-      document.body.appendChild(a);            //a标签添加到页面
-      a.click();                                //设置a标签触发单击事件
-      document.body.removeChild(a);            //移除a标签
-    },
-    dayin(){
-      var tableToPrint = document.querySelector(".el-table");//将要被打印的表格
-      var newWin= window.open("");//新打开一个空窗口
-      newWin.document.write(tableToPrint.outerHTML);//将表格添加进新的窗口
-      newWin.document.close();//在IE浏览器中使用必须添加这一句
-      newWin.focus();//在IE浏览器中使用必须添加这一句
-      newWin.print();//打印
-      newWin.close();//关闭窗口
-    },
-    
-  }
-}
-</script>
-
-<style scoped>
-.AuHiViewBody{
-  width: 100%;
-  height: 100vh;
-  background-color: rgb(245,246,251);
-  padding: 30px;
-  box-sizing: border-box;
-}
-.AuHiTop{
-  height: 110px;
-  background-color: white;
-  border-radius: 10px;
-  padding: 18px 20px 0px ;
-  box-sizing: border-box;
-}
-.AuHiBottom{
-  width: 100%;
-  background-color: white;
-  padding: 30px;
-  box-sizing: border-box;
-  height: 750px;
-  margin-top: 20px;
-}
-.el-table .warning{
-  background: red !important;
-}
-.el-table .success-row {
-  background: blue;
-}
-</style>
\ No newline at end of file

src/views/ReportHistory.vue

-<template>
-  <div>
-      <span>生产报表系统历史数据</span>
-  </div>
-</template>
-
-<script>
-export default {
-
-}
-</script>
-
-<style>
-
-</style>
\ No newline at end of file

src/views/ReportNowData.vue

-<template>
-  <div>
-      <span>生产报表系统实时数据</span>
-  </div>
-</template>
-
-<script>
-export default {
-
-}
-</script>
-
-<style>
-
-</style>
\ No newline at end of file

src/views/SlopeNowData.vue

-<template>
-  <div>
-      <span>边坡在线监测实时数据</span>
-  </div>
-</template>
-
-<script>
-export default {
-
-}
-</script>
-
-<style>
-
-</style>
\ No newline at end of file

src/views/carPositioning/alarm.vue

+<template>
+  <div>
+      <span>
+          车辆定位系统报警历史
+      </span>
+  </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file

src/views/carPositioning/enclosure.vue

+<template>
+  <div>
+      <span>车辆定位系统围栏设定</span>
+  </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file

src/views/carPositioning/histroyData.vue

+<template>
+  <div>
+      <span>
+          车辆定位系统历史数据
+      </span>
+  </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file

src/views/PersonnelPositioning.vue → src/views/carPositioning/homePage.vue

 <template>
   <div class="iframeBody">
-    
-    
+    <span>车辆定位系统</span>
   </div>
 </template>
 

src/views/carPositioning/nowData.vue

+<template>
+  <div>
+      <span>
+          车辆定位系统实时数据
+      </span>
+  </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file

src/views/carPositioning/register.vue

+<template>
+  <div>
+      <span>车辆定位系统人员等级</span>
+  </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file

src/views/carPositioning/trajectory.vue

+<template>
+  <div>
+      <span>车辆定位系统轨迹回放</span>
+  </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file

src/views/homepage.vue

@@ -21,6 +21,7 @@
         <el-row class="tac">
           <el-col :span="12">
             <el-menu class="el-menu-vertical-demo" background-color="rgb(9, 26, 69)" text-color="rgb(3,156,205)" active-text-color="white" :unique-opened="true" :router="true">
+
               <el-menu-item index="/homepage/mineMonitoring">
                   <i class="iconfont icon-solid-home" style="margin-right:10px;color:rgb(3,156,205);"></i>
                   <span slot="title">矿区监控</span>
@@ -29,40 +30,54 @@
                   <i class="iconfont icon-diannao" style="margin-right:10px;color:rgb(3,156,205);"></i>
                   <span slot="title">视频监控</span>
               </el-menu-item>
-              <el-submenu index="3">
+              <el-submenu index="shengchanzidonghua">
                 <template slot="title">
                   <i class="iconfont icon-wenjianjia" style="margin-right:10px;color:rgb(3,156,205);"></i>
                   <span>生产自动化系统</span>
                 </template>
                 <el-menu-item index="/homepage/AutomationHomepage">系统首页</el-menu-item>
-                <el-menu-item index="/homepage/AutomatedNowData">实时数据</el-menu-item>
-                <el-menu-item index="/homepage/AutomationHistory">历史数据</el-menu-item>
-                <el-menu-item index="/homepage/AutomaticAlarm">报警记录</el-menu-item>
+                <el-menu-item index="/homepage/AutomatedReport">生产报表</el-menu-item>
               </el-submenu>
-              <el-submenu index="4">
+              <el-submenu index="people">
                 <template slot="title">
-                  <i class="iconfont icon-wenjian" style="margin-right:10px;color:rgb(3,156,205);"></i>
-                  <span>生产报表系统</span>
+                  <i class="iconfont icon-dingwei" style="margin-right:10px;color:rgb(3,156,205);"></i>
+                  <span>人员定位系统</span>
                 </template>
-                <el-menu-item index="/homepage/ReportHomePage">系统首页</el-menu-item>
-                <el-menu-item index="/homepage/ReportNowData">实时数据</el-menu-item>
-                <el-menu-item index="/homepage/ReportHistory">历史数据</el-menu-item>
+                <el-menu-item index="/homepage/PersonnelPositioningHomePage">系统首页</el-menu-item>
+                <el-menu-item index="/homepage/PersonnelPositioningnowData">实时数据</el-menu-item>
+                <el-menu-item index="/homepage/PersonnelPositioningTrajectory">轨迹回放</el-menu-item>
+                <el-menu-item index="/homepage/PersonnelPositioningHistroyData">历史数据</el-menu-item>
+                <el-menu-item index="/homepage/PersonnelPositioningAlarm">报警历史</el-menu-item>
+                <el-menu-item index="/homepage/PersonnelPositioningEnclosure">围栏设定</el-menu-item>
+                <el-menu-item index="/homepage/PersonnelPositioningRegister">人员等级</el-menu-item>
               </el-submenu>
-              <el-menu-item index="/homepage/PersonnelPositioning">
-                  <i class="iconfont icon-dingwei" style="margin-right:10px;color:rgb(3,156,205);"></i>
-                  <span slot="title">人员定位系统</span>
-              </el-menu-item>
-              <el-submenu index="6">
+              <el-submenu index="cars">
+                <template slot="title">
+                  <i class="iconfont icon-car-fill" style="margin-right:10px;color:rgb(3,156,205);"></i>
+                  <span>车辆定位系统</span>
+                </template>
+                <el-menu-item index="/homepage/carPositioningHomePage">系统首页</el-menu-item>
+                <el-menu-item index="/homepage/carPositioningnowData">实时数据</el-menu-item>
+                <el-menu-item index="/homepage/carPositioningTrajectory">轨迹回放</el-menu-item>
+                <el-menu-item index="/homepage/carPositioningHistroyData">历史数据</el-menu-item>
+                <el-menu-item index="/homepage/carPositioningAlarm">报警历史</el-menu-item>
+                <el-menu-item index="/homepage/carPositioningEnclosure">围栏设定</el-menu-item>
+                <el-menu-item index="/homepage/carPositioningRegister">人员等级</el-menu-item>
+              </el-submenu>
+              <el-submenu index="bianpo">
                 <template slot="title">
                   <i class="iconfont icon-bianpo" style="margin-right:10px;color:rgb(3,156,205);"></i>
                   <span>边坡在线监测</span>
                 </template>
                 <el-menu-item index="/homepage/SlopeHomePage">系统首页</el-menu-item>
-                <el-menu-item index="/homepage/SlopeNowData">实时数据</el-menu-item>
+                <el-menu-item index="/homepage/SlopeHorizontal">坝体表面水平位移</el-menu-item>
+                <el-menu-item index="/homepage/SlopeVertical">坝体表面竖向位移</el-menu-item>
+                <el-menu-item index="/homepage/SlopeRainfall">降雨量</el-menu-item>
+                <el-menu-item index="/homepage/SlopeEarlyWarning">预警级别设置</el-menu-item>
                 <el-menu-item index="/homepage/SlopeHistory">历史数据</el-menu-item>
                 <el-menu-item index="/homepage/SlopeAlarm">报警记录</el-menu-item>
               </el-submenu>
-              <el-submenu index="7">
+              <el-submenu index="huanjign">
                 <template slot="title">
                   <i class="iconfont icon-yezi" style="margin-right:10px;color:rgb(3,156,205);"></i>
                   <span>环境在线监测</span>
@@ -72,37 +87,46 @@
                 <el-menu-item index="/homepage/EnvironmentHistory">历史数据</el-menu-item>
                 <el-menu-item index="/homepage/EnvironmentAlarm">报警记录</el-menu-item>
               </el-submenu>
-              <el-menu-item index="reservesHomepage">
+              <el-submenu index="shuzihuachuliang">
+                <template slot="title">
                   <i class="iconfont icon-kuaizhuanggengduo" style="margin-right:10px;color:rgb(3,156,205);"></i>
-                  <span slot="title">数字化储量管理</span>
-              </el-menu-item>
-              <el-menu-item index="AccessHomepage">
+                  <span>数字化储量管理</span>
+                </template>
+                <el-menu-item index="/homepage/reservesHomepage">系统首页</el-menu-item>
+                <el-menu-item index="/homepage/reservesList">管理列表</el-menu-item>
+              </el-submenu>
+              <el-menu-item index="/homepage/AccessHomepage">
                   <i class="iconfont icon-IOTtubiao_huabanfuben" style="margin-right:10px;color:rgb(3,156,205);"></i>
                   <span slot="title">门禁系统</span>
               </el-menu-item>
-              <el-submenu index="10">
+              <el-menu-item index="/homepage/unman">
+                  <i class="iconfont icon-ren-pingbi" style="margin-right:10px;color:rgb(3,156,205);"></i>
+                  <span slot="title">无人值守</span>
+              </el-menu-item>
+              <el-menu-item index="jiankongdaping">
+                  <a href="http://www.baidu.com" style="color:rgb(3,156,205);text-decoration: none;-webkit-tap-highlight-color: rgba(3,156,205);">
+                    <i class="iconfont icon-diannao" style="margin-right:10px;color:rgb(3,156,205);"></i>
+                    <span slot="title">监控大屏</span>
+                  </a>
+              </el-menu-item>
+              <el-submenu index="xitongguanli">
                 <template slot="title">
-                  <i class="iconfont icon-yezi" style="margin-right:10px;color:rgb(3,156,205);"></i>
+                  <i class="iconfont icon-shezhi" style="margin-right:10px;color:rgb(3,156,205);"></i>
                   <span>系统管理</span>
                 </template>
-                <el-menu-item index="/homepage/PersonManagement">人员系统管理</el-menu-item>
+                <el-menu-item index="/homepage/personManagement">人员系统管理</el-menu-item>
                 <el-menu-item index="/homepage/carManagement">车辆系统管理</el-menu-item>
               </el-submenu>
-              <el-menu-item>
-                  <a href="http://www.baidu.com" style="color:rgb(3,156,205);text-decoration: none;-webkit-tap-highlight-color: rgba(3,156,205);">
-                    <i class="iconfont icon-car-fill" style="margin-right:10px;color:rgb(3,156,205);"></i>
-                    <span slot="title">3D切换</span>
-                  </a>
-              </el-menu-item>
+              
             </el-menu>
           </el-col>
         </el-row>
       </div>
+
       <div class="rightBody">
           <router-view></router-view>
       </div>
       
-
     </div>
     
   </div>
@@ -124,6 +148,7 @@ export default {
     // },
   },
 };
+
 </script>
 
 <style>
@@ -200,4 +225,8 @@ export default {
   width: 18px;
   height: 18px;
 }
+.el-submenu>.el-menu>.el-menu-item{
+  padding-left: 50px !important;
+  box-sizing: border-box !important;
+}
 </style>
\ No newline at end of file

src/views/personnelPositioning/alarm.vue

+<template>
+  <div>
+      <span>
+          人员定位系统报警历史
+      </span>
+  </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file

src/views/personnelPositioning/enclosure.vue

+<template>
+  <div>
+      <span>人员定位系统围栏设定</span>
+  </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file

src/views/personnelPositioning/histroyData.vue

+<template>
+  <div>
+      <span>
+          人员定位系统历史数据
+      </span>
+  </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file

src/views/personnelPositioning/homePage.vue

+<template>
+  <div class="iframeBody">
+    <span>人员定位系统</span>
+  </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style scoped>
+
+*{
+  margin: 0;
+  padding: 0;
+}
+.iframeBody{
+  width: 100%;
+  background-color: antiquewhite;
+  height: 100%;
+}
+</style>
\ No newline at end of file

src/views/personnelPositioning/nowData.vue

+<template>
+  <div>
+      <span>
+          人员定位系统实时数据
+      </span>
+  </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file

src/views/personnelPositioning/register.vue

+<template>
+  <div>
+      <span>人员定位系统人员等级</span>
+  </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file

src/views/personnelPositioning/trajectory.vue

+<template>
+  <div>
+      <span>人员定位系统轨迹回放</span>
+  </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file

src/views/AutomatedNowData.vue → src/views/productionAutomation/AutomatedReport.vue

@@ -2,7 +2,7 @@
   <div class="AuHiViewBody">
 
     <div class="AuHiTop">
-      <div style="font-size:20px;font-weight:600;">实时数据查询搜索</div>
+      <div style="font-size:20px;font-weight:600;">查询搜索</div>
       <div style="margin-top:10px;display:flex;">
         <div>
           <template>
@@ -57,7 +57,7 @@
 
     <div class="AuHiBottom">
       <template>
-        <el-table :data="historyData" height="700" border style="width: 100%" :row-style="tableRowStyle">
+        <el-table :data="automatedReportData" height="700" border style="width: 100%" :row-style="tableRowStyle">
           <el-table-column prop="equipment" label="产品设备" align="center"></el-table-column>
           <el-table-column prop="name" label="指标名称" align="center"></el-table-column>
           <el-table-column prop="numerical" label="数值" align="center"></el-table-column>
@@ -119,7 +119,64 @@ export default {
       selectDate2:{
         value:""
       },
-      historyData:this.$store.state.b.now.tableData,
+      automatedReportData:[{
+        equipment: '2016-05-02',
+        name: '王小虎',
+        numerical: '上海市普陀区金沙江路 1518 弄',
+        alarmLevel: '2016-05-02',
+        time: '王小虎',
+        status: '上海市普陀区金沙江路 1518 弄'
+      },{
+        equipment: '2016-05-02',
+        name: '王小虎',
+        numerical: '上海市普陀区金沙江路 1518 弄',
+        alarmLevel: '2016-05-02',
+        time: '王小虎',
+        status: '上海市普陀区金沙江路 1518 弄'
+      },{
+        equipment: '2016-05-02',
+        name: '王小虎',
+        numerical: '上海市普陀区金沙江路 1518 弄',
+        alarmLevel: '2016-05-02',
+        time: '王小虎',
+        status: '上海市普陀区金沙江路 1518 弄'
+      },{
+        equipment: '2016-05-02',
+        name: '王小虎',
+        numerical: '上海市普陀区金沙江路 1518 弄',
+        alarmLevel: '2016-05-02',
+        time: '王小虎',
+        status: '上海市普陀区金沙江路 1518 弄'
+      },{
+        equipment: '2016-05-02',
+        name: '王小虎',
+        numerical: '上海市普陀区金沙江路 1518 弄',
+        alarmLevel: '2016-05-02',
+        time: '王小虎',
+        status: '上海市普陀区金沙江路 1518 弄'
+      },{
+        equipment: '2016-05-02',
+        name: '王小虎',
+        numerical: '上海市普陀区金沙江路 1518 弄',
+        alarmLevel: '2016-05-02',
+        time: '王小虎',
+        status: '上海市普陀区金沙江路 1518 弄'
+      },{
+        equipment: '2016-05-02',
+        name: '王小虎',
+        numerical: '上海市普陀区金沙江路 1518 弄',
+        alarmLevel: '2016-05-02',
+        time: '王小虎',
+        status: '上海市普陀区金沙江路 1518 弄'
+      },{
+        equipment: '2016-05-02',
+        name: '王小虎',
+        numerical: '上海市普陀区金沙江路 1518 弄',
+        alarmLevel: '2016-05-02',
+        time: '王小虎',
+        status: '上海市普陀区金沙江路 1518 弄'
+      }],
+
     }
   },
   methods:{
@@ -155,7 +212,6 @@ export default {
       newWin.print();//打印
       newWin.close();//关闭窗口
     },
-    
   }
 }
 </script>

src/views/AutomationHomepage.vue → src/views/productionAutomation/AutomationHomepage.vue

@@ -15,7 +15,14 @@
 export default {
   data(){
     return{
-      brieflyMenuBarArray:this.$store.state.b.brieflyMenuBar.context,
+      brieflyMenuBarArray:[
+        {name:"破碎机1",context:"正常"},
+        {name:"破碎机2",context:"正常"},
+        {name:"通风除尘1",context:"正常"},
+        {name:"通风除尘2",context:"正常"},
+        {name:"通风除尘3",context:"正常"},
+        {name:"通风除尘4",context:"正常"},
+      ],
     }
   }
 }
@@ -41,7 +48,7 @@ export default {
 .AutomationSpecificItems{
   width: 100%;
   height: 90px;
-  background-image: url('../imgs/changkuang1.png');
+  background-image: url('../../imgs/changkuang1.png');
   background-size: 100% 100%;
 }
 </style>
\ No newline at end of file

src/views/AutomaticAlarm.vue → src/views/reserves/list.vue

 <template>
   <div>
-      <span>生产自动化报警记录</span>
+      <span>数字化储量管理列表</span>
   </div>
 </template>
 

src/views/slope/earlyWarning.vue

+<template>
+  <div>
+      <span>边坡在线监测预警级别设置</span>
+  </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file

src/views/slope/horizontal.vue

+<template>
+  <div>
+      <span>边坡在线监测坝体表面水平位移</span>
+  </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file

src/views/slope/rainfall.vue

+<template>
+  <div>
+      <span>边坡在线监测降雨量</span>
+  </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file

src/views/slope/vertical.vue

+<template>
+  <div>
+      <span>边坡在线监测坝体表面竖向位移</span>
+  </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file

src/views/ReportHomePage.vue → src/views/unman.vue

 <template>
   <div>
-      <span>生产报表系统首页</span>
+      <span>无人值守</span>
   </div>
 </template>