Merge branch 'feature-2025-1-10' into jenkins-test

src/views/questionnaire-statistics-new/detail.tsx

@@ -15,6 +15,8 @@ import gradeIcon from './images/class_icon.png';
 import { number } from 'echarts';
 import { drawCircle } from './drawGraph'
 import OFullRefresh from '@/components/m-full-refresh';
+import useWeChatShare from '@/hooks/useWeChatShare';
+import { browser } from '@/helpers/utils';
 
 
 export default defineComponent({
@@ -22,6 +24,14 @@ export default defineComponent({
   setup() {
     const route = useRoute();
     const router = useRouter();
+    const areaTenantName = sessionStorage.getItem('areaTenantName') || ''
+    const shareTitle = areaTenantName + '音乐（器乐）数字化转型问卷统计';
+    const weChatShare = useWeChatShare(
+      shareTitle,
+      '科学的教育改变世界，科技的力量让音乐传播更远，让孩子奏响心中的乐章',
+      window.location.origin + '/classroom-app/shareImg/question-share.png'
+    );
+
     const tabName = ref('all');
     const forms = reactive({
       schoolName: '',
@@ -176,11 +186,15 @@ export default defineComponent({
           if (percentage > Math.max(state.schoolInfo.supportStudentRate, state.schoolInfo.participationStudentRate)) {
             clearInterval(state.intervalOne); // 停止定时器
             state.intervalOne = null;
+            // percentage = 0;
           }
         }, 25); // 每25ms更新一次
       });
     }
     onMounted(async () => {
+      if (browser().weixin) {
+        weChatShare.getAppSignature()
+      }
       initData()
     });
     onUnmounted(() => {

src/views/questionnaire-statistics-new/index.module.less

@@ -194,7 +194,7 @@
     display: flex;
     align-items: center;
     height: 28px;
-    box-sizing: border-box;
+    // box-sizing: border-box;
     background: #fff;
     border: 1px solid #fff;
     border-radius: 14px;
@@ -224,7 +224,7 @@
   }
   .sortActive {
     background: rgba(28,172,241,0.06);
-    border: 1px solid #2FAFF1;
+    border: 1PX solid #2FAFF1;
     font-size: 12px;
     color: #1CACF1;
     font-weight: 600;
@@ -523,19 +523,19 @@
     background: #FFFFFF;
     border-radius: 10px;
     display: flex;
-    padding: 14px;
+    padding: 14px 4px 8px 14px;
     .siRight {
       height: 60px;
       display: flex;
       flex-direction: column;
       justify-content: space-between;
-      padding: 10px 0;
-      margin-left: 6px;
+      padding: 18px 0;
+      margin-left: 2px;
       >div {
         font-size: 12px;
         color: #777777;
         span {
-          font-size: 20px;
+          font-size: 18px;
           font-weight: 500;
         }
         i {
@@ -549,8 +549,8 @@
       }
     }
     .siLeft {
-      width: 85px;
-      height: 85px;
+      width: 80px;
+      height: 80px;
       position: relative;
       >p {
         position: absolute;

src/views/questionnaire-statistics-new/index.tsx

@@ -74,7 +74,7 @@ export default defineComponent({
         // 没有缓存
         if (!sessionStorage.getItem('areaIdx')) {
           const defaultIndex = data.findIndex((item: any) => item.defaultFlag)
-          forms.areaIdx = defaultIndex ? Number(defaultIndex) : 0
+          forms.areaIdx = defaultIndex !== -1 ? Number(defaultIndex) : 0
         }
         forms.currentArea = forms.areaColumns.length ? forms.areaColumns[forms.areaIdx].text : ''
         forms.currentAreaInfo = forms.areaList.length ? forms.areaList[forms.areaIdx] : null;
@@ -164,6 +164,7 @@ export default defineComponent({
 
     const skipDetail = (id: any) => {
       // sessionStorage.setItem('areaIdx', forms.areaIdx)
+      sessionStorage.setItem('areaTenantName', forms.totalInfo.tenantName || '')
       sessionStorage.setItem('qsFilterParams', JSON.stringify({
         schoolName: forms.schoolName,
         sortType: forms.sortType,

src/views/questionnaire-statistics/detail.tsx

@@ -14,6 +14,8 @@ import schoolIcon from './images/school_icon.png';
 import gradeIcon from './images/class_icon.png';
 import { number } from 'echarts';
 import OFullRefresh from '@/components/m-full-refresh';
+import useWeChatShare from '@/hooks/useWeChatShare';
+import { browser } from '@/helpers/utils';
 
 
 export default defineComponent({
@@ -21,6 +23,14 @@ export default defineComponent({
   setup() {
     const route = useRoute();
     const router = useRouter();
+    const areaTenantName = sessionStorage.getItem('areaTenantName') || ''
+    const shareTitle = areaTenantName + '音乐（器乐）数字化转型问卷统计';
+    const weChatShare = useWeChatShare(
+      shareTitle,
+      '科学的教育改变世界，科技的力量让音乐传播更远，让孩子奏响心中的乐章',
+      window.location.origin + '/classroom-app/shareImg/question-share.png'
+    );
+
     const tabName = ref('all');
     const forms = reactive({
       schoolName: '',
@@ -149,6 +159,9 @@ export default defineComponent({
     };
 
     onMounted(async () => {
+      if (browser().weixin) {
+        weChatShare.getAppSignature()
+      }
       await queryInfo()
       queryList()
     });

src/views/questionnaire-statistics/index.tsx

@@ -73,7 +73,7 @@ export default defineComponent({
         // 没有缓存
         if (!sessionStorage.getItem('areaIdx')) {
           const defaultIndex = data.findIndex((item: any) => item.defaultFlag)
-          forms.areaIdx = defaultIndex ? Number(defaultIndex) : 0
+          forms.areaIdx = defaultIndex !== -1 ? Number(defaultIndex) : 0
         }
         forms.currentArea = forms.areaColumns.length ? forms.areaColumns[forms.areaIdx].text : ''
         forms.currentAreaInfo = forms.areaList.length ? forms.areaList[forms.areaIdx] : null;
@@ -140,6 +140,7 @@ export default defineComponent({
 
     const skipDetail = (id: any) => {
       // sessionStorage.setItem('areaIdx', forms.areaIdx)
+      sessionStorage.setItem('areaTenantName', forms.totalInfo.tenantName || '')
       sessionStorage.setItem('yqsFilterParams', JSON.stringify({
         schoolName: forms.schoolName,
         sortType: forms.sortType,