Merge remote-tracking branch 'origin/dev' into dev

entry/src/main/ets/pages/Judge.ets

@@ -336,20 +336,26 @@ struct Index {
   // 获取场地设备信息
   async initCDSBInfo() {
     const cdsbParams = await getSyncData('MA_CDSBINFO')
+    //只记录考试项目的模型
+    const projectsObj = this.projectsObj
     //@ts-ignore
     cdsbParams.forEach((cdsb) => {
       const key = decodeURI(cdsb.itemsno);
       const newKey = key.split('~').join('_')
+      //@ts-ignore
+      const xmdm = key.split('~')[0] * 1
+      if(projectsObj[xmdm]){
         this.cdsbInfoObj[newKey] = {
           kdid: cdsb.kdid,
           sbbh: cdsb.sbbh,
           sbbm: cdsb.sbbm,
           itemsno: key,
           modelKey: newKey,
-        //@ts-ignore
+          xmdm,
-        xmdm: key.split('~')[0] * 1,
           xmxh: key.split('~')[1],
         }
+      }
+
     })
   }