Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

TEAMModelBI/ClientApp/src/api/index.js

@@ -559,6 +559,10 @@ export default {
     getfilterSchool(data) {
         return post('/prodanalysis/get-school', data)
     },
+    //ID歸戶增量統計
+    getTmidUseprod(data) {
+        return post('/tmid/get-tmid-useprod', data)
+    },
     /*产品使用分析end*/
 
     //获取地址location

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

@@ -3,8 +3,8 @@
         <div class="inquire-title">
             <p>TEAM Model 智慧教育</p>
         </div>
-        <el-tabs v-if="pageShow ==='default'" style="width: 100%;height:100%;" type="card" class="demo-tabs">
-            <el-tab-pane label="用户查询" style="padding: 1%;display: flex;justify-content: center;">
+        <el-tabs v-if="pageShow ==='default'" style="width: 100%;height:100%;" type="card" class="demo-tabs" v-model="activeTab">
+            <el-tab-pane label="用户查询" style="padding: 1%;display: flex;justify-content: center;" name="tab1">
                 <div class="searchbox" v-loading="searchLoading" element-loading-text="数据搜索中...">
                     <div class="searchbox-title">
                         <p>用户查询</p>
@@ -39,9 +39,12 @@
                     </div>
                 </div>
             </el-tab-pane>
-            <el-tab-pane label="弱歸戶" style="padding: 1%">
+            <el-tab-pane label="弱歸戶" style="padding: 1%" name="tab2">
                 <UpdCodeW />
             </el-tab-pane>
+            <el-tab-pane label="ID歸戶增量統計"  name="tab3">
+                <IdIncrement />
+            </el-tab-pane>
         </el-tabs>
         <div class="inquirebox-details" v-else-if="pageShow ==='details'">
             <Detailsbox :searchdata="searchResult" :defDate="defDate" @parentClick="backClicks"></Detailsbox>
@@ -49,11 +52,12 @@
     </div>
 </template>
 <script setup>
-import { ref, getCurrentInstance, watch, h, nextTick,provide } from 'vue'
+import { ref, reactive, getCurrentInstance, watch, h, nextTick,provide } from 'vue'
 import { ElMessage, ElLoading } from 'element-plus'
 import { Search,Delete } from '@element-plus/icons'
 import Detailsbox from './details.vue'
 import UpdCodeW from './updCodeW.vue'
+import IdIncrement from './idIncrement.vue'
 import {useRoute} from "vue-router"
 import { useStore } from 'vuex'
 let { proxy } = getCurrentInstance()
@@ -75,6 +79,7 @@ let selecttypes = ref('precise')
 let searchResult=ref()
 let defDate = ref()
 let searchLoading=ref(false)
+let activeTab = reactive('tab1')
 const searchRecordsArr = ref(localStorage.getItem('searchRecords') ?  JSON.parse(localStorage.getItem('searchRecords')):[]);
 const backClicks=()=>{pageShow.value='default'}
 console.log(searchRecordsArr.value,'搜索记录')

TEAMModelOS.FunctionV4/CosmosDB/TriggerArt.cs

@@ -415,7 +415,13 @@ namespace TEAMModelOS.FunctionV4.CosmosDB
                                 if (exams.Count == 0) return; 
                                 foreach (var ss in art.subjects)
                                 {
-                                    knoledge.Add(await getKnowledge(art.periodType, exams.Where(c => c.subjects[0].id.Equals(ss.id))?.FirstOrDefault().papers[0].code, client, ss.id, exams.Where(c => c.subjects[0].id.Equals(ss.id))?.FirstOrDefault().papers[0].periodId));
+                                    if (string.IsNullOrEmpty(exams[0].papers[0].periodId)) {
+                                        
+                                        knoledge.Add(await getKnowledge("university", "hbcn", client, ss.id, "be32942d-97a9-52ba-45d6-2e5b722583f5"));
+                                    } else {
+                                        knoledge.Add(await getKnowledge(art.periodType, exams.Where(c => c.subjects[0].id.Equals(ss.id))?.FirstOrDefault().papers[0].code, client, ss.id, exams.Where(c => c.subjects[0].id.Equals(ss.id))?.FirstOrDefault().papers[0].periodId));
+                                    }
+                                   
                                 }
 
                                 List<(string name, double score, double aver, string subject)> blockScore = new();
@@ -521,7 +527,16 @@ namespace TEAMModelOS.FunctionV4.CosmosDB
                                         aver = z.ToList().Sum(j => j.aver)
                                     })
                                 });
-                                var subjectKnow = knoledge.Where(c => c.ptype.Equals(art.periodType)).Select(x => new { x.subId, x.knos }).ToList();
+                                //List<(string subId,List<(string name, List<string> kno)>)> subjectKnow = knoledge.Select(x => new { x.subId, x.knos }).ToList();
+                                //var subjectKnow;
+                                var subjectKnow = string.IsNullOrEmpty(exams[0].papers[0].periodId) ? knoledge.Select(x => new { x.subId, x.knos }).ToList() : knoledge.Where(c => c.ptype.Equals(art.periodType)).Select(x => new { x.subId, x.knos }).ToList();
+                                /*if (string.IsNullOrEmpty(exams[0].papers[0].periodId))
+                                {
+                                    var subjectKnow = knoledge.Select(x => new { x.subId, x.knos }).ToList();
+                                }
+                                else {
+                                    var subjectKnow = knoledge.Where(c => c.ptype.Equals(art.periodType)).Select(x => new { x.subId, x.knos }).ToList();
+                                }*/
                                 List<(string subjectId, List<(string name, double score, double persent, double aver, List<string> dim)> bks)> bs = new();
                                 List<(string subjectId, List<(string stuId, List<(string name, double score, double point, List<string> dim)> values)> stuBks)> sbs = new();
                                 List<(string name, double score, double av, string sId)> stuBlockScore = new();