zhaoke 3 жил өмнө
parent
commit
da1097c5b2

+ 8 - 3
src/views/noPower/index.vue

@@ -3,6 +3,9 @@
     <!-- <sidebar class="sidebar-container" style="width:88px" /> -->
     <div class="main-container">
       <navbar />
+      <div class="t30">
+        <Journal />
+      </div>
     </div>
     <!--修改密码弹框-->
     <Dialog width="496px" customClass="dataStoreInfoDialog" :flag="pwdflag">
@@ -23,7 +26,7 @@
         </div>
         <div class="foot center t30">
           <el-button size="medium" type="primary" @click="addSubmit('dataForm')" class="r24">保存</el-button>
-          <el-button size="medium" @click="resetForm('dataForm')">取消</el-button>
+          <el-button v-if="!firstLogin" size="medium" @click="resetForm('dataForm')">取消</el-button>
         </div>
       </div>
     </Dialog>
@@ -43,6 +46,7 @@
 
 <script>
 import { Navbar, Sidebar } from '@/layout/components'
+import Journal from '../dashboard/components/journal.vue'
 import { mapGetters } from 'vuex'
 import { EditPwd } from '@/api/apiHome'
 import Dialog from '@/layout/components/Dialog'
@@ -51,7 +55,8 @@ export default {
   components: {
     Navbar,
     Sidebar,
-    Dialog
+    Dialog,
+    Journal
   },
   data () {
     return {
@@ -74,7 +79,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['pwdflag', 'outflag', 'name'])
+    ...mapGetters(['pwdflag', 'outflag', 'name', 'firstLogin'])
   },
   methods: {
     //存储数据项-提交