瀏覽代碼

feat: 修改

TIANYONG 1 月之前
父節點
當前提交
54b0199680

+ 3 - 2
src/views/questionnaire-statistics/detail.tsx

@@ -11,6 +11,7 @@ import scIcon1 from './images/sc_icon1.png';
 import scIcon2 from './images/sc_icon2.png';
 import scIcon3 from './images/sc_icon3.png';
 import schoolIcon from './images/school_icon.png';
+import gradeIcon from './images/class_icon.png';
 import { number } from 'echarts';
 
 
@@ -141,7 +142,7 @@ export default defineComponent({
 
         <div class={styles.dbStatic}>
           <div class={styles.dsItem}>
-            <div><span>{state.schoolInfo.supportStudentNum}</span>人</div>
+            <div><span>{state.schoolInfo.supportStudentNum}</span><i></i></div>
             <p>支持学校开展</p>
             <i class={[styles.dsIcon, styles.dsIcon1]}></i>
           </div>
@@ -179,7 +180,7 @@ export default defineComponent({
             state.classList.map((item: any) => (
               <div class={styles.sItem}>
               <div class={styles.itemTile}>
-                <img src={schoolIcon} />
+                <img src={gradeIcon} />
                 <p>{item.currentGrade||''}{item.currentClass || ''}</p>
               </div>
               <ul class={styles.itemContent}>

二進制
src/views/questionnaire-statistics/images/arrow_icon.png


二進制
src/views/questionnaire-statistics/images/class_icon.png


二進制
src/views/questionnaire-statistics/images/sc_line.png


二進制
src/views/questionnaire-statistics/images/xz_icon1.png


二進制
src/views/questionnaire-statistics/images/xz_icon2.png


+ 19 - 5
src/views/questionnaire-statistics/index.module.less

@@ -48,7 +48,7 @@
   height: 145px;
   margin: 8px 0 12px;
   .scTop {
-    margin: 25px 0 0 24px;
+    margin: 21px 0 0 24px;
     display: inline-block;
     align-items: flex-end;
     font-size: 14px;
@@ -61,6 +61,8 @@
       font-weight: 500;
       position: relative;
       z-index: 2;
+      margin: 0 1px 0 4px;
+      top: 2px;
     }
     > i {
       font-style: normal;
@@ -95,6 +97,8 @@
           font-style: normal;
           color: #777777;
           font-size: 14px;
+          position: relative;
+          top: -1px;
         }
       }
       .sDesc {
@@ -148,13 +152,16 @@
       background: transparent;
       border: none;
     }
+    .van-cell:after {
+      display: none;
+    }
   }
 }
 
 .sortColumn {
   display: flex;
   align-items: center;
-  margin-top: 16px;
+  margin-top: 12px;
   position: sticky;
   >li {
     display: flex;
@@ -243,6 +250,8 @@
             font-style: normal;
             font-size: 12px;
             color: #777777;
+            position: relative;
+            top: -1px;
           }
         }
         >p {
@@ -316,7 +325,7 @@
     border-radius: 10px;
     position: relative;
     overflow: hidden;
-    padding: 14px 0 16px 22px;
+    padding: 14px 0 16px 16px;
     >div {
       display: flex;
       align-items: flex-end;
@@ -328,6 +337,11 @@
         font-weight: 500;
         color: #259CFE;
       }
+      i {
+        position: relative;
+        top: -2px;
+        font-style: normal;
+      }
     }
     >p {
       font-size: 13px;
@@ -335,8 +349,8 @@
     }
     .dsIcon {
       position: absolute;
-      right: 2px;
-      bottom: 2px;
+      right: 0;
+      bottom: 0;
     }
     .dsIcon1 {
       background: url('./images/xz_icon2.png') no-repeat center;

+ 26 - 4
src/views/questionnaire-statistics/index.tsx

@@ -71,9 +71,31 @@ export default defineComponent({
       } catch (error) {
         
       }
+      await queryInfo();
       await getList();
     }
 
+    const queryInfo = async () => {
+      try {
+        const { provinceCode='',cityCode='',regionCode='' } = forms.currentAreaInfo
+        const res = await request.post(
+          '/edu-app/open/schoolMeetingQuestion/areaSummarySum',
+          {
+            data: {
+              tenantId: forms.tenantId,
+              schoolName: forms.schoolName,
+              provinceCode,
+              cityCode,
+              districtCode: regionCode,
+            }
+          }
+        );
+        forms.totalInfo = res.data|| {}
+      } catch (error) {
+        
+      }
+    }
+
     const getList = async () => {
       try {
         console.log(11111)
@@ -93,8 +115,7 @@ export default defineComponent({
           }
         );
 
-        forms.schoolList = res.data?.page || []
-        forms.totalInfo = res.data?.summary || {}
+        forms.schoolList = res?.data || []
       } catch {
         // 
       } finally {
@@ -153,14 +174,14 @@ export default defineComponent({
               </div>
             </li>
             <li>
-              <div class={styles.sNum}><span class={styles.sRed}>{forms.totalInfo.supportNum || 0}</span><i>人</i></div>
+              <div class={styles.sNum}><span class={styles.sBlue}>{forms.totalInfo.supportNum || 0}</span><i>人</i></div>
               <div class={styles.sDesc}>
                 <img src={scIcon2} />
                 支持学校开展
               </div>
             </li>
             <li>
-              <div class={styles.sNum}><span class={styles.sRed}>{forms.totalInfo.supportRate || 0}%</span></div>
+              <div class={styles.sNum}><span class={styles.sBlue}>{forms.totalInfo.supportRate || 0}%</span></div>
               <div class={styles.sDesc}>
                 <img src={scIcon3} />
                 支持率
@@ -282,6 +303,7 @@ export default defineComponent({
                 forms.areaOptionIndex = [val.selectedOptions[0].value]
                 forms.areaStatus = false;
                 forms.currentAreaInfo = forms.areaList[val.selectedOptions[0].value]
+                queryInfo()
                 getList()
               }}
             />

+ 1 - 1
vite.config.ts

@@ -14,7 +14,7 @@ function resolve(dir: string) {
 // https://vitejs.dev/config/
 // https://github.com/vitejs/vite/issues/1930 .env
 // const proxyUrl = 'https://test.lexiaoya.cn/';
-const proxyUrl = 'https://dev.kt.colexiu.com/';
+const proxyUrl = 'https://test.kt.colexiu.com/';
 // const proxyUrl = 'http://192.168.3.143:7093/';
 // const proxyUrl = 'https://dev.kt.colexiu.com/';
 export default defineConfig({