ソースを参照

优化首页菜单导航记录

ZaiZai 2 年 前
コミット
da2bb1450e

+ 31 - 20
src/layout/index.vue

@@ -144,6 +144,11 @@ watch(() => [
 
 //设置折叠
 const setIsCollapse = (key) => {
+    if (key === 'home-index') {
+        useAppState.setMenuBarShow(false)
+    } else {
+        useAppState.setMenuBarShow(true)
+    }
     if (key === 'data-fill-wbs') {
         isCollapse.value = true
         useAppState.setCollapse(true)
@@ -273,31 +278,37 @@ let socket;
 const setInitSocket = () => {
     const user_id = userInfo.value.user_id;
     socket = new WebSocket(website.socket + user_id);
-    socket.onopen = function (evt) {
-        console.log('websocket链接成功');
-    };
-    socket.onclose = function (evt) {
-        console.log('websocket连接已断开')
-    };
-    socket.onmessage = function ({data}) {
-        if (data) {
-            msgCount.value = JSON.parse(data)
-        }
-        console.log(data, '消息信息')
-    };
-    socket.onerror = function ({data}) {
-        console.log('发生错误:', data)
-    };
+    try {
+        socket.onopen = function (evt) {
+            console.log('websocket链接成功');
+        };
+        socket.onclose = function (evt) {
+            console.log('websocket连接已断开')
+        };
+        socket.onmessage = function ({data}) {
+            if (data) {
+                msgCount.value = JSON.parse(data)
+            }
+            console.log(data, '消息信息')
+        };
+        socket.onerror = function ({data}) {
+            console.log('发生错误:', data)
+        };
+    } catch {
+    }
 }
 
 //发送消息
 const socketSend = (msg) => {
-    if (socket) {
-        socket.send(msg);
-    } else {
-        setTimeout(() => {
+    try {
+        if (socket) {
             socket.send(msg);
-        }, 1000)
+        } else {
+            setTimeout(() => {
+                socket.send(msg);
+            }, 1000)
+        }
+    } catch {
     }
 }
 </script>

+ 1 - 1
src/layout/modules/MenuStretchBar.vue

@@ -1,7 +1,7 @@
 <template>
     <el-tooltip content="显示/隐藏 菜单记录" placement="top">
         <div class="header-icon-bar" @click="toMenuBarShowClick">
-            <HcIcon name="apps" :fill="menuBarShow" class="header-icon" :class="menuBarShow?'text-main':''"/>
+            <HcIcon :class="menuBarShow?'text-main':''" :fill="menuBarShow" class="header-icon" name="apps"/>
         </div>
     </el-tooltip>
 </template>

+ 38 - 33
src/store/index.js

@@ -1,18 +1,18 @@
-import { defineStore } from 'pinia'
+import {defineStore} from 'pinia'
 import pinia from "~src/store/init"
 import appConfig from '~src/config/app';
-import {getStoreData, setStoreData, clearStoreAll}  from '~src/utils/storage'
-import {setToken, setRefreshToken, removeToken,removeRefreshToken} from '~src/api/util/auth'
+import {getStoreData, setStoreData, clearStoreAll} from '~src/utils/storage'
+import {setToken, setRefreshToken, removeToken, removeRefreshToken} from '~src/api/util/auth'
 
 export const useAppStore = defineStore('main', {
-    state: () =>({
+    state: () => ({
         //主题信息
         theme: getStoreData('theme') || appConfig.theme,    //用户可选择类型:auto,light, dark
         themeVal: getStoreData('themeVal') || '',           //实际主题:light, dark
         color: getStoreData('color') || appConfig.color,
         homeTheme: getStoreData('homeTheme') || appConfig.homeTheme,
         //用户信息
-        token: getStoreData( 'token') || '',
+        token: getStoreData('token') || '',
         refreshToken: getStoreData('refreshToken') || '',
         tenantId: getStoreData('tenantId') || '',
         userInfo: getStoreData('userInfo') || {},
@@ -31,9 +31,9 @@ export const useAppStore = defineStore('main', {
         shotWebRtc: getStoreData('shotWebRtc') || 0, //WebRtc截图方式: 0关闭,1开启
         fullScreen: getStoreData('fullScreen') || 0, //全屏截图:0关闭,1开启
         isCollapse: getStoreData('isCollapse') || false, //菜单折叠
+        menuBarShow: getStoreData('menuBarShow') || true, //顶部菜单是否显示
         isScreenShort: false,
         barMenuName: '',
-        menuBarShow: true, //顶部菜单是否显示
     }),
     getters: {
         //主题信息
@@ -61,53 +61,54 @@ export const useAppStore = defineStore('main', {
         getOrderServiceTipModal: state => state.orderServiceTipModal,
         getShotWebRtc: state => state.shotWebRtc,
         getFullScreen: state => state.fullScreen,
-        getCollapse: state => state.isCollapse
+        getCollapse: state => state.isCollapse,
+        getMenuBarShow: state => state.menuBarShow
     },
     actions: {
         //主题信息
         setTheme(value) {
             this.theme = value
-            setStoreData('theme',value)
+            setStoreData('theme', value)
         },
         setThemeVal(value) {
             this.themeVal = value
-            setStoreData('themeVal',value)
+            setStoreData('themeVal', value)
         },
         setColor(value) {
             this.color = value
-            setStoreData('color',value)
+            setStoreData('color', value)
         },
         setHomeTheme(value) {
             this.homeTheme = value
-            setStoreData('homeTheme',value)
+            setStoreData('homeTheme', value)
         },
         //用户信息
-        setTokenVal(value){
+        setTokenVal(value) {
             this.token = value
             setToken(value)
-            setStoreData('token',value)
+            setStoreData('token', value)
         },
-        setRefreshTokenVal(value){
+        setRefreshTokenVal(value) {
             this.refreshToken = value
             setRefreshToken(value)
-            setStoreData('refreshToken',value)
+            setStoreData('refreshToken', value)
         },
-        setTenantId(value){
+        setTenantId(value) {
             this.tenantId = value
-            setStoreData('tenantId',value)
+            setStoreData('tenantId', value)
         },
-        setUserInfo(value){
+        setUserInfo(value) {
             this.userInfo = value
-            setStoreData('userInfo',value)
+            setStoreData('userInfo', value)
         },
         //菜单信息
-        setMenus(value){
+        setMenus(value) {
             this.menus = value
-            setStoreData('menus',value)
+            setStoreData('menus', value)
         },
-        setButtons(value){
+        setButtons(value) {
             this.buttons = value
-            setStoreData('buttons',value)
+            setStoreData('buttons', value)
         },
         getButtonsVal(value) {
             return this.buttons[value] || false;
@@ -115,47 +116,51 @@ export const useAppStore = defineStore('main', {
         //项目合同段数据
         setProjectContract(value) {
             this.projectContract = value
-            setStoreData('projectContract',value)
+            setStoreData('projectContract', value)
         },
         setProjectInfo(value) {
             this.projectInfo = value
-            setStoreData('projectInfo',value)
+            setStoreData('projectInfo', value)
         },
         setContractInfo(value) {
             this.contractInfo = value
-            setStoreData('contractInfo',value)
+            setStoreData('contractInfo', value)
         },
         setProjectId(value) {
             this.projectId = value
-            setStoreData('projectId',value)
+            setStoreData('projectId', value)
         },
         setContractId(value) {
             this.contractId = value
-            setStoreData('contractId',value)
+            setStoreData('contractId', value)
         },
         //其他配置信息
         setBubble(value) {
             this.bubble = value
-            setStoreData('bubble',value)
+            setStoreData('bubble', value)
         },
         setOrderServiceTipModal(value) {
             this.orderServiceTipModal = value
-            setStoreData('orderServiceTipModal',value)
+            setStoreData('orderServiceTipModal', value)
         },
         setScreenShort(value) {
             this.isScreenShort = value
         },
         setShotWebRtc(value) {
             this.shotWebRtc = value
-            setStoreData('shotWebRtc',value)
+            setStoreData('shotWebRtc', value)
         },
         setFullScreen(value) {
             this.fullScreen = value
-            setStoreData('fullScreen',value)
+            setStoreData('fullScreen', value)
         },
         setCollapse(value) { //菜单折叠
             this.isCollapse = value
-            setStoreData('isCollapse',value)
+            setStoreData('isCollapse', value)
+        },
+        setMenuBarShow(value) {
+            this.menuBarShow = value
+            setStoreData('menuBarShow', value)
         },
         //清除缓存和token
         clearStoreData() {

+ 7 - 6
src/views/data-fill/components/ListItem.vue

@@ -19,14 +19,15 @@
                                         复制本表
                                     </el-button>
                                 </HcTooltip> -->
-                                <HcTooltip  keys="wbs_copy_table">
+                                <HcTooltip keys="wbs_copy_table">
                                     <el-button
                                         v-if="item['isLinkTable'] === 1"
                                         disabled plain
                                         type="info">
                                         复制本表
                                     </el-button>
-                                    <el-button v-else plain type="primary" @click.stop="copyClick(item,index)" :loading="copyClickLoading" >复制本表
+                                    <el-button v-else :loading="copyClickLoading" plain type="primary"
+                                               @click.stop="copyClick(item,index)">复制本表
                                     </el-button>
                                 </HcTooltip>
                                 <HcTooltip keys="wbs_hide_table">
@@ -1113,7 +1114,7 @@ const handleMenuSelect = ({key}) => {
 
     } else if (key === 'formula') {
         formulaModal.value = true
-        console.log(tableFormItemNode.value,'tableFormItemNode.value');
+        console.log(tableFormItemNode.value, 'tableFormItemNode.value');
         getPanel()
 
 
@@ -1149,7 +1150,7 @@ const PanelSaveClick = async (item, index) => {
         value: formulaModalinfo?.value?.type,
         pkeyId: tableFormItemNode.value?.pkeyId,
         scope: componentDetail?.value['scope'],
-        code:componentDetail?.value?.info['code'],
+        code: componentDetail?.value?.info['code'],
     })
     if (!error && code === 200) {
         window?.$message?.success('操作成功')
@@ -1603,8 +1604,8 @@ const getSearchNodeTables = async () => {
     insertDataSelectoading.value = false
     if (!error && code === 200) {
         testReportData.value = getArrValue(data)
-        if(testReportData.value.length>0){
-            testReportId.value=testReportData.value[0].pKeyId
+        if (testReportData.value.length > 0) {
+            testReportId.value = testReportData.value[0].pKeyId
             getBussddataInfotrialData()
         }
     } else {