修改了首页

components/headers/header-menu.vue

@@ -2,9 +2,9 @@
   <div>
     <!--头部 header-->
     <div
-      style="height:60px;width:100%;position: fixed"
       :class="{'background-black':skin==='black_b','background-green':skin==='green_g',
-      'background-blue':skin==='blue_b','theme-star':skin ==='theme-star'}">
+      'background-blue':skin==='blue_b','theme-star':skin ==='theme-star'}"
+      style="height:60px;width:100%;position: fixed">
       <header-top
                   :menu-list="menuList"
                   :menu-theme="menuTheme"
@@ -16,7 +16,7 @@
     </div>
     <div>
       <!--左侧菜单 menu-->
-      <div class="menu-list-cont background-black-menu" :class="{'shrink-menu-list-cont':isShrink}">
+      <div :class="{'shrink-menu-list-cont':isShrink}" class="menu-list-cont background-black-menu">
         <div style="color: #fff;">
           <!--展开时的菜单-->
           <side-bar-menu
@@ -27,7 +27,7 @@
         </div>
       </div>
       <!--右侧面包屑 bread-->
-      <div class="bread-list-cont" :class="{'shrink-bread-list-cont':isShrink,'skin-star-bread':skin ==='theme-star'}">
+      <div :class="{'shrink-bread-list-cont':isShrink,'skin-star-bread':skin ==='theme-star'}" class="bread-list-cont">
         <bread-crumbs v-if="!navTags" :crumbs="crumbs"/>
         <Tags v-else class="tags-con"/>
       </div>
@@ -36,7 +36,8 @@
 </template>
 <script>
 import Store from 'store2'
-import SideBarMenu from '../menus/side-bar-menu'
+// import SideBarMenu from '../menus/side-bar-menu'
+import SideBarMenu from '../menus/sideBarMenu'
 // import ShrinkSideBarMenu from '../menus/shrink-side-bar-menu'
 import breadCrumbs from '../base/breadCrumbs'
 import { sysResource, sysUser } from '../../api'
@@ -111,7 +112,7 @@ export default {
       this._recursion(notZero, [zero[0]])
       this.menuListTemp = zero[0].leftMenus
       this.menuList = zero
-      // console.log(this.menuList)
+      console.log('menuListTemp', this.menuListTemp)
     },
     // 递归查询菜单
     _recursion(more, rest) {

components/menus/sideBarMenu.vue

+<template>
+  <div>
+    <el-menu
+      :default-active="defaultActive"
+      background-color="#495060"
+      text-color="#eee"
+      :active-text-color="activeTextColor"
+      :unique-opened="true"
+      active-text-color="#ffd04b">
+      <template v-for="(item,index) in menuList">
+        <!--不存在二级，只有一级菜单-->
+
+        <!--有二级菜单-->
+        <el-submenu :index="item.name" :key="index" v-if="item.leftMenus">
+          <template slot="title">
+            <i class="el-icon-menu"></i>
+            <span slot="title"> {{item.name}}</span>
+          </template>
+          <template v-for="(child,childIndex) in item.leftMenus">
+            <el-menu-item
+              :index="child.name"
+              :key="childIndex"
+              @click.native="_goto(child.uri)">
+              <i class="el-icon-menu"></i>
+              <span slot="title"> {{child.name}}</span>
+            </el-menu-item>
+          </template>
+        </el-submenu>
+        <el-menu-item
+          :index="item.name"
+          :key="index"
+          @click.native="_goto(item.uri)"
+          v-else>
+          <i class="el-icon-menu"></i>
+          <span slot="title"> {{item.name}}</span>
+        </el-menu-item>
+
+      </template>
+    </el-menu>
+  </div>
+</template>
+
+<script>
+/**
+ * * 展开时的菜单
+ */
+
+export default {
+  // props: {
+  //   menuList: Array,
+  //   menuTheme: {
+  //     type: String,
+  //     default: 'dark'
+  //   }
+  // },
+  props: ['menuList', 'menuTheme', 'activeTextColor'],
+  data() {
+    return {
+      openNames: [],
+      activeName: '',
+      defaultActive: '',
+      menuListCon: this.menuList
+    }
+  },
+  watch: {
+    $route(newRoute) {
+      this._setDefaultMenu(newRoute)
+    }
+  },
+  mounted() {
+    this._setDefaultMenu(this.$route)
+  },
+  methods: {
+    _goto(next) {
+      this.$router.push(next)
+    },
+    _setDefaultMenu(route) {
+      console.log('123456789', this.menuListCon)
+      console.log(route)
+      this.defaultActive = route.meta.title
+      console.log(this.defaultActive)
+    }
+  }
+}
+</script>

pages/workbench/statistical-panel/inspectionIngPanel.vue

@@ -50,6 +50,7 @@ export default {
   methods: {
     toSendTask() {
       this.$router.push('/meter/test/send_sample_input')
+      // window.location.href = '/meter/test/send_sample_input'
     },
     _request: async function() {
       // type  请求 0:当天  1：本周   2：本月

pages/workbench/statistical-panel/inspectionPanel.vue

@@ -50,6 +50,7 @@ export default {
   methods: {
     toSendOut() {
       this.$router.push('/meter/entrust/send_test')
+      // window.location.href = '/meter/entrust/send_test'
     },
     _request: async function() {
       // type  请求 0:当天  1：本周   2：本月

pages/workbench/statistical-panel/reportIssuePanel.vue

@@ -11,8 +11,8 @@
               v-for="(item,index) in buttonList"
               :key="index"
               :class="{buttonActive :activityIndex === index}"
-              type="primary"
               @click.stop="_buttonChange(index)"
+              type="primary"
             >
               {{ item }}
             </Button>
@@ -57,6 +57,7 @@ export default {
     },
     _toIssue() {
       this.$router.push('/meter/certificate/certificate_issue')
+      // window.location.href = '/meter/certificate/certificate_issue'
     },
     _buttonChange(index) {
       this.activityIndex = index

pages/workbench/statistical-panel/writeReportPanel.vue

@@ -50,6 +50,7 @@ export default {
   methods: {
     _toWrite() {
       this.$router.push('/meter/certificate/certificate_make')
+      // window.location.href = '/meter/certificate/certificate_make'
     },
     _request: async function() {
       // type  请求 0:当天  1：本周   2：本月

router/meter-routes.js

@@ -118,12 +118,12 @@ export default [
       {
         path: 'send_test',
         component: MeterSendEntrustIndex,
-        meta: { title: '送检委托登记' }
+        meta: { title: '送检委托单' }
       },
       {
         path: 'go_out_test',
         component: MeterGoOutEntrustIndex,
-        meta: { title: '出检委托登记' }
+        meta: { title: '出检委托单' }
       },
       {
         path: 'entrust_review',
@@ -164,7 +164,7 @@ export default [
       {
         path: 'send_sample_input',
         component: MeterSampleInputIndex,
-        meta: { title: '样品录入' }
+        meta: { title: '检测数据录入' }
       }
     ]
   },