소스 검색

修改统计

lex-xin 3 달 전
부모
커밋
ffb43eb4f9
4개의 변경된 파일62개의 추가작업 그리고 25개의 파일을 삭제
  1. 35 4
      src/views/tenantAllData/index.module.less
  2. 17 9
      src/views/tenantAllData/index.tsx
  3. 9 11
      src/views/tenantAllData/tenantDataSchool.tsx
  4. 1 1
      vite.config.ts

+ 35 - 4
src/views/tenantAllData/index.module.less

@@ -260,11 +260,8 @@
     transition: 0.2;
   }
 
+
   .schoolItem {
-    // display: flex;
-    // flex-direction: row;
-    // align-items: center;
-    // justify-content: space-between;
     background-color: #fff;
     margin-bottom: 12px;
     padding: 12px;
@@ -357,6 +354,40 @@
 }
 
 
+.tenantSchoolData {
+
+  .refreshC {
+    width: 100%;
+  }
+  :global {
+    .van-list {
+      display: flex;
+      flex-wrap: wrap;
+    }
+  }
+
+  .schoolItem {
+    // display: flex;
+    // flex-direction: row;
+    // align-items: center;
+    // justify-content: space-between;
+    background-color: #fff;
+    margin-bottom: 12px;
+    // margin-right: 9px;
+    padding: 12px;
+    border-radius: 10px;
+    min-height: 73px;
+    width: 48.5%;
+    &:nth-child(odd) {
+      margin-right: 3%;
+    }
+    &:nth-child(even) {
+      margin-right: 0;
+    }
+  }
+}
+
+
 .popSearchList {
   width: 138px;
   background: #FFFFFF;

+ 17 - 9
src/views/tenantAllData/index.tsx

@@ -58,6 +58,7 @@ export default defineComponent({
       statObj: {
         registerNum: 0,
         schoolNum: 0,
+        classNum: 0,
         registerMemberShipNum: 0
       } as any,
       perponStatus: false,
@@ -487,7 +488,7 @@ export default defineComponent({
               </DropdownMenu>
             </div>
             <div class={[styles.cardWrap, styles.cardWrapIndex]}>
-              <div class={[styles.studentCard, styles.cardItem]}>
+              {/* <div class={[styles.studentCard, styles.cardItem]}>
                 <div class={styles.cardNum}>
                   {numeral(forms.statObj.registerNum).format('0,0')}
                 </div>
@@ -496,7 +497,7 @@ export default defineComponent({
                   报名人数
                 </div>
                 <div class={styles.cardLine}></div>
-              </div>
+              </div> */}
               <div class={[styles.schoolCard, styles.cardItem]}>
                 <div class={styles.cardNum}>
                   {numeral(forms.statObj.schoolNum).format('0,0')}
@@ -517,7 +518,7 @@ export default defineComponent({
                 </div>
                 <div class={styles.cardLine}></div>
               </div>
-              <div class={[styles.memberRateCard, styles.cardItem]}>
+              {/* <div class={[styles.memberRateCard, styles.cardItem]}>
                 <div class={styles.cardNum}>
                   {numeral(
                     formatMemberRate(
@@ -532,7 +533,7 @@ export default defineComponent({
                   数字化普及率
                 </div>
                 <div class={styles.cardLine}></div>
-              </div>
+              </div> */}
             </div>
             <div class={styles.searchWrap}>
               <div class={styles.searechInfo}>
@@ -641,12 +642,19 @@ export default defineComponent({
                       <p class={styles.schoolName}>{item.schoolName}</p>
                     </div>
                     <div class={styles.schoolCountWrap}>
-                      <div>
+                      {/* <div>
                         <p class={styles.personNum}>
                           {numeral(item.registerNum || 0).format('0,0')}
-                          {/* {item.registerNum || 0} */}
                         </p>
                         <p class={styles.title}>报名人数</p>
+                      </div> */}
+                      <div>
+                        <p class={styles.personNum}>
+                          {numeral(item.classNum || 0).format(
+                            '0,0'
+                          )}
+                        </p>
+                        <p class={styles.title}>班级数量</p>
                       </div>
                       <div>
                         <p class={styles.personNum}>
@@ -657,7 +665,7 @@ export default defineComponent({
                         </p>
                         <p class={styles.title}>数字化人数</p>
                       </div>
-                      <div>
+                      {/* <div>
                         <p class={styles.personNum}>
                           {numeral(
                             formatMemberRate(
@@ -665,10 +673,10 @@ export default defineComponent({
                               item.registerMemberShipNum || 0
                             )
                           ).format('0.0')}
-                          %{/* {} */}
+                          %
                         </p>
                         <p class={styles.title}>数字化普及率</p>
-                      </div>
+                      </div> */}
                       <div
                         onClick={() => {
                           forms.urlItem = item;

+ 9 - 11
src/views/tenantAllData/tenantDataSchool.tsx

@@ -185,7 +185,7 @@ export default defineComponent({
       }
     };
     return () => (
-      <div class={styles.tenantAllData}>
+      <div class={[styles.tenantAllData, styles.tenantSchoolData]}>
         {/* <OHeader isBack={false} /> */}
         <MSticky position="top">
           <div class={styles.top}>
@@ -211,7 +211,7 @@ export default defineComponent({
               </div> */}
             </div>
             <div class={styles.cardWrap}>
-              <div class={[styles.studentCard, styles.cardItem]}>
+             {/*  <div class={[styles.studentCard, styles.cardItem]}>
                 <div class={styles.cardNum}>
                   {numeral(forms.statObj.registerNum).format('0,0')}
                 </div>
@@ -220,7 +220,7 @@ export default defineComponent({
                   报名人数
                 </div>
                 <div class={styles.cardLine}></div>
-              </div>
+              </div> */}
               <div class={[styles.schoolCard, styles.cardItem]}>
                 <div class={styles.cardNum}>
                   {numeral(forms.statObj.classNum).format('0,0')}
@@ -241,7 +241,7 @@ export default defineComponent({
                 </div>
                 <div class={styles.cardLine}></div>
               </div>
-              <div class={[styles.memberRateCard, styles.cardItem]}>
+              {/* <div class={[styles.memberRateCard, styles.cardItem]}>
                 <div class={styles.cardNum}>
                   {numeral(
                     formatMemberRate(
@@ -256,7 +256,7 @@ export default defineComponent({
                   数字化普及率
                 </div>
                 <div class={styles.cardLine}></div>
-              </div>
+              </div> */}
             </div>
             <div class={styles.searchWrap}>
               <div class={styles.searechInfo}>
@@ -391,23 +391,21 @@ export default defineComponent({
                       </p>
                     </div>
                     <div class={styles.schoolCountWrap}>
-                      <div>
+                      {/* <div>
                         <p class={styles.personNum}>
                           {numeral(item.registerNum || 0).format('0,0')}
-                          {/* {item.registerNum || 0} */}
                         </p>
                         <p class={styles.title}>报名人数</p>
-                      </div>
+                      </div> */}
                       <div>
                         <p class={styles.personNum}>
                           {numeral(item.registerMemberShipNum || 0).format(
                             '0,0'
                           )}
-                          {/* {item.registerMemberShipNum || 0} */}
                         </p>
                         <p class={styles.title}>数字化人数</p>
                       </div>
-                      <div>
+                      {/* <div>
                         <p class={styles.personNum}>
                           {numeral(
                             formatMemberRate(
@@ -418,7 +416,7 @@ export default defineComponent({
                           %
                         </p>
                         <p class={styles.title}>数字化普及率</p>
-                      </div>
+                      </div> */}
                       {/* <img class={[styles.arrow]} src={arrowIcon} alt="" /> */}
                     </div>
                   </div>

+ 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://test.kt.colexiu.com/';
+const proxyUrl = 'https://dev.kt.colexiu.com/';
 // const proxyUrl = 'http://192.168.3.143:7093/';
 // const proxyUrl = 'https://dev.kt.colexiu.com/';
 export default defineConfig({