瀏覽代碼

优化辅助屏操作

zhangyu 5 年之前
父節點
當前提交
a905467320

+ 2 - 0
src/components/business_space/business/handsontable.vue

@@ -33,6 +33,7 @@
 import "@/assets/js/chosen.jquery.min";
 import tools from "@/utils/scan/tools";
 import "@/assets/js/handsontable-chosen-editor";
+import lStorage from '@/utils/localStorage'
 import myPagination from "@/components/common/myPagination";
 import addBusiness from "@/components/business_space/dialogs/addDialog/businessDialog"
 import showTools from "@/utils/handsontable/notShow"
@@ -248,6 +249,7 @@ export default {
     },
     getInfors(infos, row) {
       let val = this.hot.colToProp(row.col);
+      lStorage.set('screen_data', {path: this.$route.path, data: {RoomID: infos.RoomID, zone: this.zoneCode}})
       if (val == "point") {
         this.$router.push({
           path: "/ledger/spaceDetail",

+ 2 - 1
src/framework/layout/PageHeader.vue

@@ -41,6 +41,7 @@
 import frameworkApi from '@/api/framework'
 import { mapGetters, mapMutations } from 'vuex'
 import MessageSever from '../components/messagesever/index'
+import lStorage from '@/utils/localStorage'
 export default {
     name: 'PageHeader',
     props: [],
@@ -75,7 +76,7 @@ export default {
         }
     },
     created() {
-        let cacheInfo = JSON.parse(localStorage.getItem('_sagacloud_admin_store_cacheInfo'))?JSON.parse(localStorage.getItem('_sagacloud_admin_store_cacheInfo')):{}
+        let cacheInfo = lStorage.get('cacheInfo')?lStorage.get('cacheInfo'):{}
         if(cacheInfo[this.userInfo.userName] && 
             cacheInfo[this.userInfo.userName].projectId && 
             this.projects.some((item) => {return item.id == cacheInfo[this.userInfo.userName].projectId})

+ 5 - 5
src/framework/layout/layout-store.js

@@ -1,6 +1,6 @@
 import frameworkApi from '@/api/framework'
 import storage from '@/framework/utils/storage'
-import localStorage from '@/utils/localStorage'
+import lStorage from '@/utils/localStorage'
 import axios from 'axios'
 import authutils from '../../utils/authutils'
 
@@ -62,18 +62,18 @@ export default {
         setSidebarSelected: (state, val) => {
             state.sidebarSelected = val
             storage.set(KEY_MENU_SELECTED, val)
-            localStorage.set('screen_data', {path: val,data: {}})
+            lStorage.set('screen_data', {path: val,data: {}})
         },
         setprojectId: (state, val) => {
-            let cacheInfo = JSON.parse(localStorage.getItem('_sagacloud_admin_store_cacheInfo'))?JSON.parse(localStorage.getItem('_sagacloud_admin_store_cacheInfo')):{}
+            let cacheInfo = lStorage.get('cacheInfo')?lStorage.get('cacheInfo'):{}
             state.projectId = val
             localStorage.setItem('projectId', val)
             if(cacheInfo[state.userInfo.userName]){
                 cacheInfo[state.userInfo.userName].projectId = val
-                localStorage.setItem('_sagacloud_admin_store_cacheInfo', JSON.stringify(cacheInfo))
+                lStorage.set('cacheInfo', cacheInfo)
             } else {
                 cacheInfo[state.userInfo.userName] = {projectId: val}
-                localStorage.setItem('_sagacloud_admin_store_cacheInfo', JSON.stringify(cacheInfo))
+                lStorage.set('cacheInfo', cacheInfo)
             }
             storage.set(KEY_PROJECT_SELECTED, val)
             state.projects.map((item) =>{

+ 31 - 6
src/views/screen/splitscreen/index.vue

@@ -2,17 +2,23 @@
  * @Author: zhangyu
  * @Date: 2019-11-05 15:36:21
  * @Info: 
- * @LastEditTime: 2019-11-06 19:09:20
+ * @LastEditTime: 2019-11-07 16:13:07
  -->
 <template>
   <div id="screenBox">
-    <router-view class="screen-router"></router-view>
+    <div class="mian-icon" v-show="$route.name == 'splitScreen'">
+      <div class="main-content">
+        <img src="@/assets/image/uncultivated.svg">
+        <h2>功能设计中。。。</h2>
+      </div>
+    </div>
+    <router-view v-show="$route.name != 'splitScreen'" class="screen-router"></router-view>
   </div>
 </template>
 
 <script>
 import { mapGetters } from 'vuex'
-import localStorage from '@/utils/localStorage'
+import lStorage from '@/utils/localStorage'
 
 export default {
   data() {
@@ -21,7 +27,7 @@ export default {
     }
   },
   created() {
-    localStorage.set('screen_data', {})
+    lStorage.set('screen_data', {})
   },
   mounted() {
     window.addEventListener("storage", event =>{
@@ -38,7 +44,7 @@ export default {
   },
   destroyed() {
     window.removeEventListener("storage", event => {})
-    localStorage.remove('screen_data')
+    lStorage.remove('screen_data')
   },
   computed: {
     ...mapGetters('layout', ['userInfo', 'projectId', 'projects', 'userId'])
@@ -70,8 +76,27 @@ export default {
 #screenBox{
   width: 100%;
   height: 100%;
+  .mian-icon{
+    width: 100%;
+    height: 100%;
+    text-align: center;
+    position: relative;
+    .main-content{
+      position: absolute;
+      top: 25%;
+      left: 50%;
+      transform: translate(-50%, 0);
+      h2{
+        text-align: center;
+        margin-top: 30px;
+      }
+    }
+  }
   .screen-router{
-    margin: 10px;
+    padding: 10px;
+    width: 100%;
+    height: 100%;
+    box-sizing: border-box;
   }
 }
 </style>