|
|
@@ -50,10 +50,10 @@
|
|
|
<!--切换和搜索-->
|
|
|
<div class="dashboard-tab flex">
|
|
|
<div class="tab">
|
|
|
- <!-- <el-radio-group v-model="radio">
|
|
|
+ <el-radio-group v-model="radio">
|
|
|
<el-radio label="1">数据分析</el-radio>
|
|
|
<el-radio label="2">日志查询</el-radio>
|
|
|
- </el-radio-group> -->
|
|
|
+ </el-radio-group>
|
|
|
</div>
|
|
|
<div class="search flex-wrap">
|
|
|
<div class="search-input flex-wrap r24">
|
|
|
@@ -71,25 +71,25 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<!--数据分析-->
|
|
|
- <!-- <Analysis @sendLog="sendLog" v-show="radio == 1" /> -->
|
|
|
+ <Analysis @sendLog="sendLog" v-show="radio == 1" />
|
|
|
<!--个人日志-->
|
|
|
- <!-- <Journal @clearQuery="clearQuery" :logObj="logObj" v-show="radio == 2" /> -->
|
|
|
- <div class="temp-banner">
|
|
|
+ <Journal @clearQuery="clearQuery" :logObj="logObj" v-show="radio == 2" />
|
|
|
+ <!-- <div class="temp-banner">
|
|
|
<h1 class="temp-banner-title">
|
|
|
欢迎使用<br>
|
|
|
<span class="temp-banner-title-sub">
|
|
|
{{ defaultSettings.title }}
|
|
|
</span>
|
|
|
</h1>
|
|
|
- </div>
|
|
|
+ </div> -->
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
import defaultSettings from '@/settings'
|
|
|
import { mapGetters } from 'vuex'
|
|
|
-// import Analysis from './components/analysis.vue'
|
|
|
-// import Journal from './components/journal.vue'
|
|
|
+import Analysis from './components/analysis.vue'
|
|
|
+import Journal from './components/journal.vue'
|
|
|
import { GetOthSystem } from '@/api/apiHome'
|
|
|
import axios from 'axios'
|
|
|
import qs from 'qs'
|
|
|
@@ -99,7 +99,7 @@ import { parseTime } from '@/utils'
|
|
|
import { getLogId, getUserId, getUserName } from '@/utils/auth'
|
|
|
export default {
|
|
|
name: 'Dashboard',
|
|
|
- // components: { Analysis, Journal },
|
|
|
+ components: { Analysis, Journal },
|
|
|
data () {
|
|
|
return {
|
|
|
defaultSettings,
|
