Browse Source

工作台

yin_yu820 3 days ago
parent
commit
c6b0e68d0d

+ 1 - 1
jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/enterpriseinfo/mapper/xml/EnterpriseInfoMapper.xml

@@ -301,7 +301,7 @@
         GROUP BY create_by ) c
         left join sys_user_role b on c.create_by=b.	user_id
         left join sys_user d on c.create_by=d.id
-        left join ly_enterprise_info e on e.phone=d.login_name
+        left join (SELECT des14,phone from ly_enterprise_info GROUP BY phone) e on e.phone=d.login_name
     </select>
 
 

+ 21 - 2
jp-ui/src/views/modules/sys/dashboard/analysis/index.vue

@@ -63,7 +63,7 @@
         <div class="main-periphery" style="height: 33%;">
           <div style="height: 25%"></div>
           <div class="main-periphery-font" style="height: 30%; color: #063e2a">
-            5月份
+            {{todaystr3}}月份
           </div>
           <div class="main-periphery-numerical" style="height: 45%; color: #028455;font-size: 15px;">
             <!-- {{ pageInfo.samemonthc }} -->
@@ -76,7 +76,7 @@
         <div class="main-periphery" style="height: 33%;">
           <div style="height: 25%"></div>
           <div class="main-periphery-font" style="height: 30%; color: #063e2a">
-            截止到5月22日
+            截止到{{todaystr2}}
           </div>
           <div class="main-periphery-numerical" style="height: 45%; color: #028455;font-size: 15px;">
             活跃用户数 {{pageInfo3.totodays.allcount+pageInfo3.totodays.totodayc}} 个 ,其中企业用户 {{pageInfo3.totodays.qycount}} 个 ,走访服务企业 {{pageInfo3.totodays.zfqycount}} 个,游客 {{pageInfo3.totodays.totodayc}} 个
@@ -437,6 +437,8 @@
             }
         },
         todaystr: "",
+        todaystr2: "",
+        todaystr3: "",
         pageInfo2: [{
           industry: '',
           cc: ''
@@ -528,10 +530,13 @@
 
       // 组合成所需的格式
       const formattedDate = `${year}-${month}-${day} 23:59:59`;
+      const formattedDate2 = `${year}年${month}月${day}日`;
 
       console.log(formattedDate); // 输出类似于 "2025-05-23 23:59:59"
 
       this.todaystr=formattedDate;
+      this.todaystr2=formattedDate2;
+      this.todaystr3=month;
       this.changeColor();
       this.getPageInfo();
       this.getMenuList();
@@ -789,6 +794,20 @@
       changeTime(){
 
         let str=this.todaystr.substring(0,10)
+
+        let date = new Date(str);
+        let year = date.getFullYear();
+        let month = date.getMonth() + 1; // getMonth() 返回的是 0 - 11
+        let day = date.getDate();
+        // 确保月份和日期都是两位数
+        month = month < 10 ? '0' + month : month;
+        day = day < 10 ? '0' + day : day;
+        let formattedDate = `${year}年${month}月${day}日`;
+
+        this.todaystr2=formattedDate;
+        this.todaystr3=month;
+
+
         //添加活跃用户汇总
         bigScreenService.InfoStatistics_Login({date:str}).then(({
           data