From 6190d8d64e1baca106c2306a7900d9e1da11d7cb Mon Sep 17 00:00:00 2001
From: jiayu <zheng_jiayu1@163.com>
Date: Sat, 26 Oct 2024 09:14:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/layout.vue                     | 17 +++--
 .../equipmentCenter/equipmentCenterIndex.vue  | 73 +++++++++++--------
 .../allInfo/componentsModule/dataListData.vue |  4 +-
 src/views/projectAdmin/projectIndex.vue       |  4 +-
 4 files changed, 59 insertions(+), 39 deletions(-)

diff --git a/src/components/layout.vue b/src/components/layout.vue
index 9967ce2f..c91e3afd 100644
--- a/src/components/layout.vue
+++ b/src/components/layout.vue
@@ -91,15 +91,10 @@
         <div class="wrapper" ref="wrapper">
           <div class="cont" ref="cont">
             <div
-              v-for="(item, index) in $store.state.menuList"
+              v-for="(item, index) in filterMenuList"
               :key="index"
               @click="clickItem(item)"
               class="menuInnerBox"
-              v-if="
-                company != 'xingxuan' &&
-                item.target != '_blank' &&
-                (item.menuName != 'LED大屏显示器' || company != 'nanchang')
-              "
             >
               <el-menu-item
                 class="firstLevelMenu"
@@ -199,6 +194,16 @@ export default {
     console.log(this.$store.state.menuList,'7778888')
     console.log(this.moduleData,'7778888')
   },
+  computed: {
+    filterMenuList() {
+      return this.$store.state.menuList.filter(item => {
+        return this.company != 'xingxuan' &&
+                item.target != '_blank' &&
+                !item.menuEquipment &&
+                (item.menuName != 'LED大屏显示器' || this.company != 'nanchang');
+      });
+    }
+  },
   mounted() {
     console.log("mounted", this.$route);
     this.$nextTick(() => {
diff --git a/src/views/equipmentCenter/equipmentCenterIndex.vue b/src/views/equipmentCenter/equipmentCenterIndex.vue
index 21c6aabc..94a69878 100644
--- a/src/views/equipmentCenter/equipmentCenterIndex.vue
+++ b/src/views/equipmentCenter/equipmentCenterIndex.vue
@@ -6,33 +6,39 @@
       <div class="pageDataContainer">
         <vue-scroll>
         <div class="projectIndexBox">
-          <div class="module_title">{{$t('message.homeLayout.existingProducts')}}</div>
+          <!-- <div class="module_title">{{$t('message.homeLayout.existingProducts')}}</div> -->
           <div class="projectIndex">
-            <div
-              class="module canclick"
-              :class="{hovers:item.operation}"
-              v-for="(item,index) in list"
-              :key="index"
-              @click="itemClick(item)"
-              v-if="item.operation&&item.moduleType==2&&item.moduleEquipment==1"
-            >
-              <img v-if="iconType == 1" :src="require('../../assets/images/menu/'+item.moduleIcon+'.png')" class="icon" />
-              <img
-                    v-if="iconType == 2 && item.bigModuleIcon"
-                    :src="
-                      require('../../assets/images/menu/' +
-                        item.bigModuleIcon +
-                        '.png')
-                    "
-                    style="margin-bottom: 10px"
-                    class="icon"
-                  />
-              <div class="title_wrap">
-                <div class="head1">{{item.moduleName}}</div>
-                <div class="subhead">{{item.moduleDesc}}</div>
-                <!-- {{$t('message.projectIndex.moudleName1')}} -->
+            <template v-for="(item, index) in filterList">
+              <div style="width: 100%;height: 1px;" v-if="index == 0 || item.operationFlag || (index > 0 && filterList[index - 1].labelName != item.labelName)"></div>
+              <div class="moduleBox" v-if="item.operation">
+                <div class="module_title" v-if="index == 0 || item.operationFlag || (index > 0 && filterList[index - 1].labelName != item.labelName)">
+                  {{ item.labelName }}
+                </div>
+                <div
+                  class="module canclick"
+                  :class="{hovers:item.operation}"
+                  :key="index"
+                  @click="itemClick(item)"
+                >
+                  <img v-if="iconType == 1" :src="require('../../assets/images/menu/'+item.moduleIcon+'.png')" class="icon" />
+                  <img
+                        v-if="iconType == 2 && item.bigModuleIcon"
+                        :src="
+                          require('../../assets/images/menu/' +
+                            item.bigModuleIcon +
+                            '.png')
+                        "
+                        style="margin-bottom: 10px"
+                        class="icon"
+                      />
+                  <div class="title_wrap">
+                    <div class="head1">{{item.moduleName}}</div>
+                    <div class="subhead">{{item.moduleDesc}}</div>
+                    <!-- {{$t('message.projectIndex.moudleName1')}} -->
+                  </div>
+                </div>
               </div>
-            </div>
+            </template>
           </div>
           <div class="module_title" v-if="showNotBuyMoudle">{{$t('message.homeLayout.ununlockedProducts')}}</div>
           <div class="projectIndex">
@@ -314,6 +320,13 @@ export default {
       iconType: '1'
     };
   },
+  computed: {
+    filterList: function () {
+      return this.list.filter((item) => {
+        return item.operation && item.moduleType==2 && item.moduleEquipment==1
+      });
+    },
+  },
   mounted(){
     if(localStorage.getItem('systemInfo')){
       this.iconType = JSON.parse(localStorage.getItem('systemInfo')).iconType ? JSON.parse(localStorage.getItem('systemInfo')).iconType:'1'
@@ -460,10 +473,8 @@ var arr = this.$store.state.userInfo.menuAuthority.moduleList
   width: 100%;
 
   display: flex;
-  align-items: center;
-  //   justify-content: space-around;
+  align-items: flex-end;
   box-sizing: border-box;
-  // padding: 0 100px;
   flex-wrap: wrap;
   margin-bottom: 8px;
   .module:nth-child(4n) {
@@ -471,14 +482,16 @@ var arr = this.$store.state.userInfo.menuAuthority.moduleList
   }
 }
 .module_title {
-  margin-left: -10px;
+  // margin-left: -10px;
+  margin-left: 0;
   border-left: 2px solid #4a8bff;
   padding-left: 8px;
   margin-bottom: 20px;
   font-size: 14px;
+  font-family: PingFang SC;
 }
 .module {
-  width: 320px;
+  width: 310px;
   // height: 124px;
   box-sizing: border-box;
   // border-radius: 3px;
diff --git a/src/views/infoCenter/allInfo/componentsModule/dataListData.vue b/src/views/infoCenter/allInfo/componentsModule/dataListData.vue
index 019f581c..67b60af8 100644
--- a/src/views/infoCenter/allInfo/componentsModule/dataListData.vue
+++ b/src/views/infoCenter/allInfo/componentsModule/dataListData.vue
@@ -218,7 +218,7 @@ export default {
       if (row.type == 11) {
         // 质量
         path = "/project/quality/inspectionLedger";
-        const res = await getQualityNoticeStatusApi({ id: payLoadParams.data.id });
+        const res = await getQualityNoticeStatusApi({ id: payLoadParams?.data?.id });
         if (!res.result || res.result.status == 6) {
           this.$message({
             type: "error",
@@ -229,7 +229,7 @@ export default {
       } else if (row.type == 10) {
         // 安全
         path = "/project/safeSame/inspectionLedger";
-        const res = await getNoticeStatusApi({ id: payLoadParams.data.id });
+        const res = await getNoticeStatusApi({ id: payLoadParams?.data?.id });
         if (!res.result || res.result.status == 6) {
           this.$message({
             type: "error",
diff --git a/src/views/projectAdmin/projectIndex.vue b/src/views/projectAdmin/projectIndex.vue
index eb430d50..4e28883e 100644
--- a/src/views/projectAdmin/projectIndex.vue
+++ b/src/views/projectAdmin/projectIndex.vue
@@ -465,11 +465,13 @@ export default {
 }
 
 .module_title {
-  margin-left: -10px;
+  // margin-left: -10px;
+  margin-left: 0px;
   border-left: 2px solid #4a8bff;
   padding-left: 8px;
   margin-bottom: 20px;
   font-size: 14px;
+  font-family: PingFang SC;
   // width: 1360px;
 }