Merge branch 'dev' of http://39.105.40.203/root/web-monitor into dev_rhx

src/components/Breadcrumb/index.vue

 <template>
-  <el-breadcrumb class="app-breadcrumb" separator="/">
+  <el-breadcrumb class="app-breadcrumb" separator=">">
     <transition-group name="breadcrumb">
       <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
         <span v-if="item.redirect==='noRedirect'||index==levelList.length-1" class="no-redirect">{{ item.meta.title }}</span>
@@ -33,7 +33,7 @@ export default {
       const first = matched[0]
 
       if (!this.isDashboard(first)) {
-        matched = [{ path: '/dashboard', meta: { title: 'Dashboard' }}].concat(matched)
+        matched = [{ path: '/dashboard', meta: { title: '首页' }}].concat(matched)
       }
 
       this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)

src/layout/components/AppMain.vue

@@ -7,6 +7,7 @@
 </template>
 
 <script>
+
 export default {
   name: 'AppMain',
   computed: {
@@ -19,6 +20,10 @@ export default {
 
 <style scoped>
 .app-main {
+  margin: 0 20px 20px 20px;
+  padding: 20px;
+  background: #fff;
+  border-radius: 8px;
   /*50 = navbar  */
   min-height: calc(100vh - 50px);
   width: 100%;

src/layout/index.vue

@@ -3,22 +3,30 @@
     <navbar />
     <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
     <div :class="{sidebarHide: sidebar.hide}" class="main-container">
+      <orgTree style="float:left" />
+      <div class="flex_clo">
+        <Breadcrumb />
         <app-main />
       </div>
     </div>
+  </div>
 </template>
 
 <script>
+import Breadcrumb from '@/components/Breadcrumb'
 import { Navbar, Sidebar, AppMain, Topbar } from './components'
 import ResizeMixin from './mixin/ResizeHandler'
+import orgTree from '@/components/orgTree.vue'
 
 export default {
   name: 'Layout',
   components: {
+    Breadcrumb,
     Navbar,
     Sidebar,
     AppMain,
-    Topbar
+    Topbar,
+    orgTree
   },
   mixins: [ResizeMixin],
   computed: {

src/router/index.js

@@ -58,12 +58,22 @@ export const constantRoutes = [
     path: '/alarm',
     component: Layout,
     redirect: '/dashboard',
-    children: [{
-      path: 'alarm',
-      name: 'Alarm',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '告警管理', icon: 'dashboard' }
-    }]
+    name: '监测实时状态',
+    meta: { title: '告警管理', icon: 'dashboard' },
+    children: [
+      {
+        path: 'leakageCable',
+        name: '漏缆实时状态',
+        component: () => import('@/views/monitor/leakageCable'),
+        meta: { title: '漏缆监测告警' }
+      },
+      {
+        path: 'equipment',
+        name: '设备实时状态',
+        component: () => import('@/views/monitor/equipment'),
+        meta: { title: '设备连接告警' }
+      }
+    ]
   },
   {
     path: '/setting',
@@ -131,12 +141,14 @@ export const constantRoutes = [
   {
     path: '/history',
     component: Layout,
-    redirect: '/dashboard',
-    children: [{
-      path: 'history',
+    redirect: '/history/historyStatus/historyStatus',
     name: 'History',
-      component: () => import('@/views/dashboard/index'),
-      meta: { title: '历史数据', icon: 'dashboard' }
+    meta: { title: 'History', icon: 'example' },
+    children: [{
+      path: 'historyStatus',
+      name: '历史数据状态',
+      component: () => import('@/views/history/historyStatus/historyStatus.vue'),
+      meta: { title: '历史数据状态' }
     }]
   },
   {

src/styles/common.scss

@@ -13,3 +13,7 @@
 .ml20 {
   margin-left: 20px;
 }
+.flex_clo {
+  display: flex;
+  flex-direction: column;
+}
\ No newline at end of file

src/styles/sidebar.scss

 #app {
 
   .main-container {
+    background-color: #F9F9F9;
     min-height: 100%;
     transition: margin-left .28s;
     // margin-left: $sideBarWidth;

src/views/dashboard/index.vue

 <template>
   <div class="dashboard-container">
-    <OrgTree />
+    <!-- <OrgTree /> -->
+
   </div>
 </template>
 

src/views/history/historyStatus/historyStatus.vue

+<template>
+<div>
+  <h1>会搜发的随风</h1>
+
+</div>
+</template>
+<script>
+import {mapGetters,mapActions} from 'vuex';
+export default {
+props: [],
+components: {},
+data() {
+return {
+      beginItem: 1,
+      endItem: 10,
+      total: 0,
+      currentPage: 1,
+      pageSize: 10,
+      historyStatusList:[
+          {
+              stationName:'STATION2未开通',
+              alarmObj:'漏缆FSU2_R1下行方向',
+              alarmInfo:'距离：0米 驻波比：8.72',
+              alarmInfo2:'距离：18米 驻波比：1.07',
+              alarmInfo3:'距离：42米 驻波比：1.02',
+              firstTime:'2022/12/18 11:51:12'
+          },
+               {
+              stationName:'STATION2未开通',
+              alarmObj:'漏缆FSU2_R1下行方向',
+              alarmInfo:'距离：0米 驻波比：8.72',
+              alarmInfo2:'距离：18米 驻波比：1.07',
+              alarmInfo3:'距离：42米 驻波比：1.02',
+               firstTime:'2022/12/18 11:51:12'
+          },     {
+              stationName:'STATION2未开通',
+              alarmObj:'漏缆FSU2_R1下行方向',
+              alarmInfo:'距离：0米 驻波比：8.72',
+              alarmInfo2:'距离：18米 驻波比：1.07',
+              alarmInfo3:'距离：42米 驻波比：1.02',
+               firstTime:'2022/12/18 11:51:12'
+          },     {
+              stationName:'STATION2未开通',
+              alarmObj:'漏缆FSU2_R1下行方向',
+              alarmInfo:'距离：0米 驻波比：8.72',
+              alarmInfo2:'距离：18米 驻波比：1.07',
+              alarmInfo3:'距离：42米 驻波比：1.02',
+               firstTime:'2022/12/18 11:51:12'
+          },     {
+              stationName:'STATION2未开通',
+              alarmObj:'漏缆FSU2_R1下行方向',
+              alarmInfo:'距离：0米 驻波比：8.72',
+              alarmInfo2:'距离：18米 驻波比：1.07',
+              alarmInfo3:'距离：42米 驻波比：1.02',
+               firstTime:'2022/12/18 11:51:12'
+          },     {
+              stationName:'STATION2未开通',
+              alarmObj:'漏缆FSU2_R1下行方向',
+              alarmInfo:'距离：0米 驻波比：8.72',
+              alarmInfo2:'距离：18米 驻波比：1.07',
+              alarmInfo3:'距离：42米 驻波比：1.02',
+               firstTime:'2022/12/18 11:51:12'
+          },
+      ],
+};
+},
+computed: {
+...mapGetters({}),
+},
+methods: {
+...mapActions({}),
+getTableData() {
+      this.tableData = this.historyStatusList.slice(
+        (this.currentPage - 1) * this.pageSize,
+        this.currentPage * this.pageSize
+      );
+      this.total = this.historyStatusList.length;
+    },
+    currentChange(val) {
+      this.currentPage = val;
+      this.getTableData();
+    },
+    sizeChange(val) {
+      console.log("改变每页多少条，当前一页多少条数据", val);
+      this.pageSize = val;
+      this.currentPage = 1;
+      this.getTableData();
+    },
+},
+mounted() {},
+};
+</script>
+<style scoped>
+</style>
\ No newline at end of file

src/views/login/index.vue

@@ -49,10 +49,10 @@
 
       <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;" @click.native.prevent="handleLogin">登录</el-button>
 
-      <div class="tips">
+      <!-- <div class="tips">
         <span style="margin-right:20px;">username: admin</span>
         <span> password:任意6位</span>
-      </div>
+      </div> -->
 
     </el-form>
     </div>
@@ -82,7 +82,7 @@ export default {
     return {
       loginForm: {
         username: 'admin',
-        password: '111111'
+        password: '123456'
       },
       loginRules: {
         username: [{ required: true, trigger: 'blur', validator: validateUsername }],
@@ -114,11 +114,19 @@ export default {
     },
     handleLogin() {
       this.$refs.loginForm.validate(valid => {
+       
         if (valid) {
           this.loading = true
           this.$store.dispatch('user/login', this.loginForm).then(() => {
+            if (this.loginForm.password=='123456') {
                this.$router.push({ path: this.redirect || '/' })
             this.loading = false
+            }
+           else{
+             alert('密码错误')
+               this.loading = false
+             return false
+           }
           }).catch(() => {
             this.loading = false
           })

src/views/maintain/oneself/index.vue

 <template>
   <div class="oneself">
-    <Breadcrumb />
     <div class="oneself-title">温馨提示：系统如无异常，请勿操作此界面</div>
     <el-form ref="form1" :model="formData1" :rules="rules1" label-width="200px" class="oneself-form">
       <el-form-item label="服务器IP地址" prop="ip">
@@ -53,7 +52,7 @@
             </el-radio>
           </el-row>
         </el-radio-group>
-        <el-button class="btn" style="width: 120px" type="primary" :loading="loading3" @click="sendContent">发送查询内容</el-button>
+        <el-button size="mini" class="btn" style="width: 120px" type="primary" :loading="loading3" @click="sendContent">发送查询内容</el-button>
       </el-form-item>
     </el-form>
     <el-form ref="form3" :model="formData3" :rules="rules3" label-width="200px" class="oneself-form">
@@ -66,7 +65,7 @@
             :value="item.value"
           />
         </el-select>
-        <el-button style="width: 120px" class="btn" type="primary" :loading="loading2" @click="sendData">发送数据</el-button>
+        <el-button size="mini" style="width: 120px" class="btn" type="primary" :loading="loading2" @click="sendData">发送数据</el-button>
       </el-form-item>
     </el-form>
     <div class="oneself-tips">当前未向服务器下发指令！</div>
@@ -74,9 +73,7 @@
 </template>
 
 <script>
-import Breadcrumb from '@/components/Breadcrumb'
 export default {
-  components: { Breadcrumb },
   data() {
     return {
       baseStationList: [],

src/views/maintain/parameter/index.vue

 <template>
   <div class="parameter">
-    <Breadcrumb />
     <div class="parameter-title">
       温馨提示：告警门限参数设置，数据如无异常，请勿修改告警门限参数！
     </div>
@@ -48,9 +47,7 @@
 </template>
 
 <script>
-import Breadcrumb from '@/components/Breadcrumb'
 export default {
-  components: { Breadcrumb },
   data() {
     return {
       loading: false,

src/views/monitor/equipment.vue

 <template>
   <!-- 漏缆实时状态 -->
   <div class="leakage-cable">
-    <breadcrumb />
     <div class="leakage-top">
       <div>
         共6条数据
@@ -31,11 +30,10 @@
 </template>
 
 <script>
-import Breadcrumb from '@/components/Breadcrumb'
 import Pagination from '@/components/Pagination'
 
 export default {
-  components: { Pagination, Breadcrumb },
+  components: { Pagination },
   data() {
     return {
       searchForm: {

src/views/monitor/leakageCable.vue

 <template>
   <!-- 漏缆实时状态 -->
   <div class="leakage-cable">
-    <breadcrumb />
     <div class="leakage-top">
       <div style="color: #666666">
         共6条数据
@@ -49,11 +48,10 @@
 </template>
 
 <script>
-import Breadcrumb from '@/components/Breadcrumb'
 import Pagination from '@/components/Pagination'
 
 export default {
-  components: { Pagination, Breadcrumb },
+  components: { Pagination },
   data() {
     return {
       searchForm: {

src/views/setting/add/index.vue

 <template>
   <div class="add">
-    <breadcrumb />
     <div class="add-tab">
       <el-tabs v-model="activeName" :stretc="true">
         <el-tab-pane
@@ -37,9 +36,7 @@
 </template>
 
 <script>
-import Breadcrumb from '@/components/Breadcrumb'
 export default {
-  components: { Breadcrumb },
   data() {
     return {
       activeName: '0',

src/views/setting/statistics/index.vue

 <template>
   <div class="statistics">
-    <Breadcrumb />
     <div class="header">
       <div class="header-left">
         <!-- <el-tabs v-model="activeName" type="border-card">
@@ -86,9 +85,8 @@
 
 <script>
 import Pagination from '@/components/Pagination'
-import Breadcrumb from '@/components/Breadcrumb'
 export default {
-  components: { Pagination, Breadcrumb },
+  components: { Pagination },
   data() {
     return {
       searchForm: {

src/views/user/updateUser/index.vue

 <template>
   <div>
-    <breadcrumb />
     <div class="update-user-container">
       <div class="header">
         <div class="tab">
@@ -16,11 +15,10 @@
 </template>
 
 <script>
-import Breadcrumb from '@/components/Breadcrumb'
 import baseInfo from '../updateUser/components/baseInfo.vue'
 import Password from '../updateUser/components/password.vue'
 export default {
-  components: { Breadcrumb, baseInfo, Password },
+  components: { baseInfo, Password },
   data() {
     return {
       options: [{

src/views/user/userList/index.vue

 <template>
   <div>
-    <breadcrumb />
     <el-row class="header">
       <el-col :span="4">
         <div class="message">共<span>{{ total }}</span>条数据</div>
@@ -43,12 +42,10 @@
 
 <script>
 import Pagination from '@/components/Pagination'
-import Breadcrumb from '@/components/Breadcrumb'
 
 export default {
   components: {
-    Pagination,
-    Breadcrumb
+    Pagination
   },
   data() {
     return {