Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev

front/src/App.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-05-06 11:12:00
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-12-29 17:12:43
+ * @LastEditTime: 2023-01-03 11:01:29
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -94,6 +94,7 @@
     //     realName = res.data.data.realName
     //   }
     realName = store.getters['user/realName']
+    console.log('真实姓名', realName)
     if (realName.length > 13) {
       onWholeWaterMark(
         [realName, moment().format('YYYY-MM-DD')],
@@ -148,6 +149,7 @@
       // if (newValue == '/home') {
       //   waterMarkInit(newValue)
       // }
+      waterMarkInit()
       changeWaterMark(newValue)
     },
     { immediate: true }

front/src/views/abilityStatistics/components/SharingSituation.vue

@@ -56,7 +56,7 @@
         </div>
 
         <div class="volume_box">
-          <div class="fugai"></div>
+          <!-- <div class="fugai"></div> -->
           <div
             v-for="(item, index) in dataLists"
             :key="item"
@@ -201,20 +201,20 @@
     })
   }
   let photoBg = ref([
-    require('../../../assets/abilityStatistics/yingyongziyuan-bg.png'),
-    require('../../../assets/abilityStatistics/zhishiku-bg.png'),
-    require('../../../assets/abilityStatistics/zujianfuwu-bg.png'),
-    require('../../../assets/abilityStatistics/shujuziyuan-bg.png'),
-    require('../../../assets/abilityStatistics/jichujianshe-bg.png'),
-    require('../../../assets/abilityStatistics/yingyongziyuan-bg.png'),
+    require('../../../assets/abilityStatistics/yyzy-bg.png'),
+    require('../../../assets/abilityStatistics/kfzj-bg.png'),
+    require('../../../assets/abilityStatistics/ywzj-bg.png'),
+    require('../../../assets/abilityStatistics/tcfw-bg.png'),
+    require('../../../assets/abilityStatistics/znsf-bg.png'),
+    require('../../../assets/abilityStatistics/hkt-bg.png'),
   ])
   let photo = ref([
-    require('../../../assets/abilityStatistics/yingyongziyuan.png'),
-    require('../../../assets/abilityStatistics/zhishiku.png'),
-    require('../../../assets/abilityStatistics/zujianfuwu.png'),
-    require('../../../assets/abilityStatistics/shujuziyuan.png'),
-    require('../../../assets/abilityStatistics/jichujianshe.png'),
-    require('../../../assets/abilityStatistics/yingyongziyuan.png'),
+    require('../../../assets/abilityStatistics/yyzy.png'),
+    require('../../../assets/abilityStatistics/kfzj.png'),
+    require('../../../assets/abilityStatistics/ywzj.png'),
+    require('../../../assets/abilityStatistics/tcfw.png'),
+    require('../../../assets/abilityStatistics/znsf.png'),
+    require('../../../assets/abilityStatistics/hkt.png'),
   ])
   //申请量接口
   let dataLists = ref([])
@@ -379,12 +379,12 @@
         display: flex;
         margin-bottom: 20px;
         color: #fff;
-        .fugai {
-          width: 40px;
-          height: 390px;
-          background: #0058e1;
-          margin-top: 1px;
-        }
+        // .fugai {
+        //   width: 40px;
+        //   height: 390px;
+        //   background: #0058e1;
+        //   margin-top: 1px;
+        // }
         .volume_box-son {
           width: 120px;
           height: 390px;
@@ -417,6 +417,11 @@
             bottom: 44px;
           }
         }
+        .volume_box-son:nth-of-type(1) {
+          width: 140px;
+          padding-left: 28px;
+          background-position-x: 10px;
+        }
       }
     }
   }