Merge branch 'cmy/develop-bi' into develop

TEAMModelBI/ClientApp/src/view/index/index.vue

@@ -2338,9 +2338,9 @@ export default {
     //获取版本占比
     async function getVersionsData () {
       let datas = siteValue.value === 'international' ? { "site": "Global" } : {}
-      await proxy.$api.getVersions(datas).then((res) => {
+      await proxy.$api.getSchool({}).then((res) => {
         if (res.state === 200) {
-           let schoolList = res.scEdCnt
+           let schoolList = res.scInfos
            console.log('进入到版本')
           // if (siteValue.value === 'china') {          
           //   versionsData.value.basics.num = res.beCnt;
@@ -3036,21 +3036,21 @@ export default {
           //   worldtotalArea.value.pie3 = dataMajor
           //   worldtotalArea.value.pie4 = dataCustom
           // }
-      let arrState = res.scEdCnt
+      let arrState = res.scInfos
       console.log()
       let marjorArr = []; let standardArr = []; let basicsArr = []; let customArr = [];
        // 專業版
        schoolList ? schoolList.forEach((item) => {
-         (item.edition == null || item.edition.scaleVersion == null || item.edition.scaleVersion == null) 
+         (item.edition == null || item.edition.scaleVersion == null) 
          && item.service.includes('IPDYZYLC') && item.service.includes('YMPCVCIM') && item.service.includes('YPXSJ6NJ') 
          ? marjorArr.push(item) : '' }) : ''
        // 標準版
        schoolList ? schoolList.forEach((item) => { 
-        (item.edition == null || item.edition.scaleVersion == null || item.edition.scaleVersion == null) 
+        (item.edition == null || item.edition.scaleVersion == null) 
         && item.service.includes('IPDYZYLC') && item.service.includes('YMPCVCIM') && (!item.service.includes('YPXSJ6NJ')) ? standardArr.push(item) : '' }) : ''
        // 基礎版
        schoolList ? schoolList.forEach((item) => { 
-        (item.edition == null || item.edition.scaleVersion == null || item.edition.scaleVersion == null) 
+        (item.edition == null || item.edition.scaleVersion == null) 
         && !item.service.includes('IPDYZYLC') && !item.service.includes('YMPCVCIM') ? basicsArr.push(item) : '' }) : ''
        // 自訂版
        schoolList ? schoolList.forEach((item) => { 

TEAMModelBI/ClientApp/src/view/schoolServe/school.vue

@@ -809,8 +809,7 @@ export default {
               } else {
                 item.versions = item.service.includes('YPXSJ6NJ') && item.service.includes('B6V5J6NP') ? '专业版' : item.service.includes('YMPCVCIM') ? '标准版' : '基础版';
               }
-          
-          }),
+        }),
         tableData.value.push(...res.scInfos),originalNum.value = res.scInfos.length,
         originalData.value = res.scInfos,tablesccnt.value = res.allCnt) 
         : ''
@@ -1503,13 +1502,14 @@ export default {
         ElMessage.error('API异常，规模版本排序失败')
       })
     }
-  // ※版本判定：1.學校管理(IPDYZYLC) + 學情分析(YMPCVCIM)=「標準版」 
-    //           2.學校管理(IPDYZYLC) + 學情分析(YMPCVCIM) + 五育看板(YPXSJ6NJ) =「專業版」  
+    // ※版本判定：1.學校管理(IPDYZYLC) + 學情分析(YMPCVCIM)=「標準版」 
+    //             2.學校管理(IPDYZYLC) + 學情分析(YMPCVCIM) + 五育看板(YPXSJ6NJ) =「專業版」  
     function versionsEstimate (val) {
       console.log(shouldFilter.value)
       let arrState = shouldFilter.value
+      console.log(arrState,'查看')
       let marjorArr = []; let standardArr = []; let basicsArr = []; let customArr = [];
-      debugger;
+      //debugger;
       // debugger;
        // 專業版
        arrState.major ? originalData.value.forEach((item) => {