duy 6 luni în urmă
părinte
comite
4dfb7aa88c

+ 15 - 11
src/renderer/src/views/home2/datav.vue

@@ -155,11 +155,7 @@ const nameRef = ref(null)
 
 
 onMounted(async () => {
-        //窗口大小改变
-        windowResize()
-    setTimeout(() => {
-        onWindowResize()
-    }, 100)
+
     await getMenuBarData()
  await getProType()
  await getDataProjectStat()
@@ -397,7 +393,15 @@ const getCompanyListTotal = async ()=>{
 //跳转到首页
 const toHomePage = () => {
     console.log(store.page)
-    router.push( { name: 'project-data' })
+    // router.push( { name: 'project-data' })
+    const hasPermission = menuBarData.value.some(item => item.code === 'project2')
+    console.log(hasPermission, 'hasPermission')
+    
+    if (!hasPermission) {
+        return
+    }
+    
+      router.push( { name: 'project-data' })
 }
 
 //监听浏览器窗口变化
@@ -453,7 +457,7 @@ const handleChartClick = (data) => {
     background-color: rgba(0, 43, 84, 0.8);
     border: 1px solid rgba(15, 84, 155, 0.8);
     border-radius: 4px;
-    height: calc(35vh - 17px);   // 修改固定高度为动态高度
+    height: calc(37vh - 17px);   // 修改固定高度为动态高度
     padding: 14px;
 }
 .bg-box-card-title{
@@ -465,8 +469,8 @@ const handleChartClick = (data) => {
     margin-bottom: 15px;
  
 }
-.hc-full {
-    height: calc(100% - 40px);  // 减去标题和padding的高度
-    overflow: hidden;
-}
+// .hc-full {
+//     height: calc(100% - 40px);  // 减去标题和padding的高度
+//     overflow: hidden;
+// }
 </style>

+ 2 - 2
src/renderer/src/views/project/data.vue

@@ -6,10 +6,10 @@
                 <hc-icon class="text-white" name="add" />
                 <span class="text-white">新增项目</span>
             </el-button>
-            <el-button type="warning" class="mr-10px" color="orange">
+            <!-- <el-button type="warning" class="mr-10px" color="orange">
                 <HcIcon name="file-transfer" class="text-white" />
                 <span class="text-white" @click="importClick">导入项目</span>
-            </el-button>
+            </el-button> -->
             <el-button v-del-com:[batRowDelClick] type="danger" :disabled="tableCheckKeys.length <= 0">
                 <HcIcon name="delete-bin" class="text-white" />
                 删除项目