merge master

zhangzengfei

2021-07-07 0b737708e696c45720499759b5c31aced87fdbb6

 src/pages/shuohuangMonitorAnalyze/index/App.vue

@@ -6,35 +6,51 @@
    <div class="right">
      <div class="top">
        <div class="collapse-trigger" @click="toggleCollapse">
          <i :class="isCollapse?'el-icon-s-fold':'el-icon-s-unfold'"></i>
          <i :class="isCollapse?'el-icon-s-unfold':'el-icon-s-fold'"></i>
        </div>
        <top-nav></top-nav>
      </div>
      <div class="container">
        <!-- 首页 -->
        <guideIndex v-show="actPage=='guideIndex'"></guideIndex>

        <searchForVideoAnalyze v-if="actPage=='searchForVideoAnalyze'"></searchForVideoAnalyze>
        <memberManage v-if="actPage=='memberManage'"></memberManage>
        <taskManage v-if="actPage=='taskManage'"></taskManage>
        <transferMemo v-if="actPage=='transferMemo'"></transferMemo>
        <transferDeviceManage v-if="actPage=='transferDeviceManage'"></transferDeviceManage>
        <configManage v-if="actPage=='configManage'"></configManage>
        <guideIndex v-if="actPage=='guideIndex'"></guideIndex>
        <lkg v-if="actPage=='lkgManage'"></lkg>
      </div>
    </div>
  </div>
</template>

<script>
import LeftNav from '../components/leftNav';
import Lkg from '../components/lkgManage'
import TopNav from '../components/topNav';
import SearchForVideoAnalyze from '../components/searchForVideoAnalyze';
import MemberManage from '../components/memberManage';
import LeftNav from '../components/leftNav';
import GuideIndex from '../components/guideIndex';
import TaskManage from '../components/taskManage';
import TransferMemo from '../components/transferMemo';
import TransferDeviceManage from '../components/transferDeviceManage';
import ConfigManage from '../components/configManage';
import GuideIndex from '../components/guideIndex';
import MemberManage from '../components/memberManage';
import TransferDeviceManage from '../components/transferDeviceManage';
import SearchForVideoAnalyze from '../components/searchForVideoAnalyze';

export default {
  components: { LeftNav, TopNav, SearchForVideoAnalyze, MemberManage, TaskManage, TransferMemo, TransferDeviceManage, ConfigManage, GuideIndex },
  components: {
    Lkg,
    LeftNav,
    TopNav,
    SearchForVideoAnalyze,
    MemberManage,
    TaskManage,
    TransferMemo,
    TransferDeviceManage,
    ConfigManage,
    GuideIndex
  },
  data () {
    return {
      isCollapse: false,
@@ -42,7 +58,7 @@
    }
  },
  mounted () {

    // this.actPage = 'guideIndex';
  },
  methods: {
    markNav () {
@@ -119,7 +135,7 @@
      padding: 0 3px;
      color: #0096fa;
    }
    i[class^='el-icon'] {
    i[class^="el-icon"] {
      padding: 3px;
      font-size: 16px;
      color: #0096fa;