Merge branch 'master' of http://git.in.ahbd.net/aielab/jcxt_qd

src/components/jc.vue

@@ -14,18 +14,21 @@
             src="../assets/img/admin.jpg"
             alt=""
           > -->
-          <span >安徽省农产品质量安全监测系统</span>
+          <span >安徽省农产品质量安全监测系统—检测平台</span>
         </div>
         <div class="right-function-container">
           <el-button @click="logout">
             退出
           </el-button>
         </div>
+        <div class="admin-wel">
+          <span>您好！检测单位--{{dwname}}</span>
+        </div>
       </el-header>
       <!--页面主体部分-->
       <el-container>
         <!--页面侧边栏(左边)-->
-        <el-aside style="width: 210px;">
+        <el-aside style="width: 13.125rem;">
           <!--        页面左侧菜单区域-->
           <el-menu
             :default-active="$route.path"
@@ -35,11 +38,7 @@
             :collapse-transition="false"
             :router="true"
           >
-            <!--            <el-menu-item
-              index="/admin"
-              @click="addTab('系统首页', '/admin')"
-            >
-              <i class="el-icon-s-home" />
+            <!-- <el-menu-item index="/jc/workbench">
               <span slot="title">系统首页</span>
             </el-menu-item> -->
             <!--          一级菜单-->
@@ -100,6 +99,10 @@
           </el-tabs>
         </el-main>
       </el-container>
+        <el-footer id="footer">
+          <p>主办单位：安徽省农业农村厅</p>
+          <p>技术支持：安徽省北斗精准农业信息工程实验室 农产品安全安徽省重点实验室</p>
+        </el-footer>
     </el-container>
   </div>
 </template>
@@ -117,7 +120,8 @@ export default {
       activeTabas: '/jc',
       Tabs: [],
       // 左侧菜单数据
-      menuList: []
+      menuList: [],
+      dwname:''//账户名称
     }
   },
   watch: {
@@ -140,22 +144,22 @@ export default {
   created () {
     this.lastTime = new Date().getTime() // 网页第一次打开时，记录当前时间
     // 保证admin中的页面刷新后重置到/admin路由下
-    if (this.$route.path !== '/jc/routineMonitor') this.$router.push('/jc/routineMonitor')
+    if (this.$route.path !== '/jc/workbench') this.$router.push('/jc/workbench')
 let groupname = window.sessionStorage.getItem('groupname')
     let data1 = []
     let data = [
-  //     {
-  //     // icon: 'el-icon-user-solid',
-  //     subMenuName: '监测模型',
-  //     children: [{
-  //       id: '1-1',
-  //       subMenuName: '模型配置',
-  //       path: '/jc/jcobj'
-  //     }
-	//   ]
-  //   },
+      {
+       subMenuName: '首页',
+      
+      children: [{
+        id: '7-1',
+        subMenuName: '控制台',
+        path: '/jc/workbench'
+      }
+	  ]
+    },
         {
-      // icon: 'el-icon-user-solid',
+     
       subMenuName: '主体信息',
       children: [{
         id: '1-1',
@@ -255,11 +259,19 @@ let groupname = window.sessionStorage.getItem('groupname')
 	  ]
     },]
     this.menuList = data
+    this.getOrganization()
   },
   mounted:function(){
-      this.addTab("例行监测",'/jc/routineMonitor')
+      this.addTab("首页",'/jc/workbench')
+      this.getOrganization()
   },
   methods: {
+    async getOrganization() {
+        const result = await this.$http.post('getOrganization')
+        
+        this.dwname = result.data.data.user_id.name
+        console.log(this.dwname)
+    },
     handleOpen (index) {
       console.log(index)
     },
@@ -392,7 +404,7 @@ let groupname = window.sessionStorage.getItem('groupname')
     }
 
     .el-header {
-        background-color: #31B404;
+        background-color: #145faa;
         width: 100%;
         color: white;
         font-size: 25px;
@@ -435,4 +447,25 @@ let groupname = window.sessionStorage.getItem('groupname')
         position: absolute;
         right: 15px;
     }
+    .admin-wel{
+      display:flex
+    }
+    /deep/ #footer {
+
+        // display: flex;
+        // flex-direction: row;
+        // position: absolute;
+        // bottom: 0px;
+        // background-color: #5087bd;
+        color: #413b3b;
+        width: 100%;
+        text-align: center;
+        font-size: .875rem;
+        // height: 6.25rem;
+        // // padding-top: 5px;
+        // // opacity: 0.6;
+        font-weight: 550;
+        margin-bottom: 1%;
+        // font: 24px bold #0055ff;
+      }
 </style>

src/router/index.js

@@ -232,6 +232,10 @@ const routes = [{
 			path: '/jc/setReturnTasks',
 			name:'setReturnTasks',
 			component: () => import('../components/jc/setReturnTasks')
+		},{
+			path: '/jc/workbench',
+			name:'workbench',
+			component: () => import('../components/jc/workbench')
 		}
 		]
 	},{